Merge branch 'fix-2023-04' into 'developer'

Fix 2023 04

See merge request !101

gic-cloud-data-hook-service/src/main/java/com/gic/cloud/data/hook/service/impl/FlatQueryResultServiceImpl.java

@@ -921,6 +921,7 @@ public class FlatQueryResultServiceImpl implements IFlatQueryResultService {
 			logger.info("不存在");
 			return;
 		}
+		boolean delHiveFile=true;
 		Integer queryDataType = task.getQueryDataType();
 		FlatQueryTaskCondition condition = JSON.parseObject(task.getDownloadCondition(), FlatQueryTaskCondition.class);
 		if (!task.getStatus().equals(DownloadTaskStatus.BUILDING)) {
@@ -932,8 +933,6 @@ public class FlatQueryResultServiceImpl implements IFlatQueryResultService {
 		//下载文件
 		String dirName=HDFSUtil.getInstance().getHdfsName(task.getId());
 		String path=HDFSUtil.getInstance().getHdfsPath(task.getId());
-
-		HDFSUtil.getInstance().getHdfsName(task.getId());
 		try {
 			StopWatch stopWatch = StopWatch.create("down");
 			stopWatch.start();
@@ -969,6 +968,7 @@ public class FlatQueryResultServiceImpl implements IFlatQueryResultService {
 			if (task.getAmount()!=total.intValue()) {
 				String msg="取数任务："+task.getId()+"下载数量对不上: 数量: "+task.getAmount()+"->"+total;
 				DingWarningUtil.sendCountWarning(msg);
+				delHiveFile=false;
 			}
 			stopWatch.start();
 			//是否压缩
@@ -995,8 +995,6 @@ public class FlatQueryResultServiceImpl implements IFlatQueryResultService {
 			task.setOverTime(new Date());
 			task.setFilePath(cloudFileUrl);
 
-
-
 		}catch (Exception e) {
 			logger.info("异常：{}",e);
 			task.setStatus(DownloadTaskStatus.ERROR);
@@ -1004,6 +1002,9 @@ public class FlatQueryResultServiceImpl implements IFlatQueryResultService {
 			DownloadTaskServiceImpl.getInstance().updateDownloadTask(task);
 			//删除文件
 			delFileOrDirByTaskId(task.getId());
+			if (delHiveFile) {
+				HDFSUtil.getInstance().deleteFile(path);
+			}
 		}
 	}