update with batch upload

build/classes/app.properties

@@ -3,3 +3,4 @@ AppParamHelper=cn.tsy.idsse.dsds.helper.DSDSParamHelper
 AppDatabaseStdout=Active
 AppListener=cn.tsy.idsse.dsds.control.DSDSInitializeLisener
 AppName=DSDS2024Server
+DatabaseWarnDelayTimes=10000

src/main/java/app.properties

@@ -3,3 +3,4 @@ AppParamHelper=cn.tsy.idsse.dsds.helper.DSDSParamHelper
 AppDatabaseStdout=Active
 AppListener=cn.tsy.idsse.dsds.control.DSDSInitializeLisener
 AppName=DSDS2024Server
+DatabaseWarnDelayTimes=10000

src/main/java/cn/tsy/idsse/dsds/service/sample/SampleDatasetTrackService.java

@@ -27,9 +27,13 @@ public class SampleDatasetTrackService {
 	public List<SampleDatasetTrack> uploadTrack(int dataset_id, List<String> array, String file_name, FrameOptr optr) {
 		FrameAssertHelper.hasValue(array, "潜次轨迹文件为空，请检查！");
 		List<SampleDatasetTrack> navArray = new ArrayList<>();
-		SampleDataset dataset = this.mDataset.find(dataset_id);
+		String dv_sn = file_name.replace(".txt", "");
-		FrameAssertHelper.isNotNull(dataset, "未找到指定数据集，请检查！");
+		List<SampleDataset> sdArray = this.mDataset.selectListByColumn("diving_sn", dv_sn);
-		this.mTrack.deleteByColumn("dataset_id", dataset_id);
+		if (sdArray.size() == 0)
+			throw new BusinessException("未找到潜次[" + dv_sn + "]对应的数据集！");
+//		SampleDataset dataset = this.mDataset.find(dataset_id);
+//		FrameAssertHelper.isNotNull(dataset, "未找到指定数据集，请检查！");
+//		this.mTrack.deleteByColumn("dataset_id", dataset_id);
 		for (int i = 0; i < array.size(); i++) {
 			if (array.get(i).trim().length() == 0)
 				break;
@@ -73,19 +77,22 @@ public class SampleDatasetTrackService {
 			nav.setTrack_lat(lat);
 			nav.setTrack_lon(lon);
 			nav.setTrack_time(curTime);
-			nav.setDataset_id(dataset_id);
-			// 判断时间是否重复了
-//			List<SampleDatasetTrack> vArray = this.mTrack.selectList(SqlBuilder.create().addSqlCondition(SqlCondition.of("dataset_id", dataset_id)).addSqlCondition(SqlCondition.of("track_time", curTime)));
-//			if (vArray.size() == 0) {
-			this.mTrack.insert(nav);
 			navArray.add(nav);
-//			}
+
 		}
 		if (navArray.size() > 0) {
-			SampleDataset ds = new SampleDataset();
+			for(SampleDataset ds :sdArray) {
-			ds.setTsy_id(dataset_id);
+				this.mTrack.deleteByColumn("dataset_id", ds.getTsy_id());
-			ds.setDiving_track_file(file_name);
+				for(SampleDatasetTrack nav :navArray) {
+					nav.setTsy_id(null);
+					nav.setDataset_id(ds.getTsy_id());
+					this.mTrack.insert(nav);
+				}
+				SampleDataset d = new SampleDataset();
+				d.setTsy_id(dataset_id);
+				d.setDiving_track_file(file_name);
 				this.mDataset.update(ds);
+			}
 
 		}
 		return navArray;

src/main/java/cn/tsy/idsse/dsds/service/sample/SampleLineTrackService.java

@@ -31,15 +31,22 @@ public class SampleLineTrackService {
 
 	public List<SampleLineTrack> uploadTrack(int dataset_id, List<String> array, String file_name) {
 		FrameAssertHelper.hasValue(array, "测线轨迹文件为空，请检查！");
-		SampleDataset ds = this.mDataset.find(dataset_id);
+//		SampleDataset ds = this.mDataset.find(dataset_id);
-		FrameAssertHelper.isNotNull(ds, "未找到指定数据集，请检查！");
+//		FrameAssertHelper.isNotNull(ds, "未找到指定数据集，请检查！");
-		this.mTrack.deleteByColumn("dataset_id", dataset_id);
+
+//		this.mTrack.deleteByColumn("dataset_id", dataset_id);
+		// 找出所有航线
+		String dv_sn = file_name.replace(".txt", "").replace("_Clean", "");
+		List<SampleDataset> sdArray = this.mDataset.selectListByColumn("diving_sn", dv_sn);
+		if (sdArray.size() == 0)
+			throw new BusinessException("未找到潜次[" + dv_sn + "]对应的数据集！");
+		for (SampleDataset ds : sdArray) {
 			int index = 1;
 
 			List<SampleLineTrack> navArray = new ArrayList<>();
 			for (int i = 0; i < array.size(); i++) {
 				if (array.get(i).trim().length() == 0) {
-				this.update(file_name,ds, index, navArray);
+					this.update(file_name, ds, index, navArray);
 					break;
 				}
 				String[] values = StringHelper.splitWithSpace(array.get(i));
@@ -96,8 +103,9 @@ public class SampleLineTrackService {
 				navArray.add(nav);
 //			}
 			}
+		}
 
-		return navArray;
+		return new ArrayList<>();
 	}
 
 	public void update(String file_name, SampleDataset ds, int index, List<SampleLineTrack> navArray) {