添加下载渠道以及下载时间

gic-cloud-data-hook-api/.flattened-pom.xml

@@ -4,12 +4,12 @@
   <modelVersion>4.0.0</modelVersion>
   <groupId>com.gic</groupId>
   <artifactId>gic-cloud-data-hook-api</artifactId>
-  <version>2.28</version>
+  <version>3.0-SNAPSHOT</version>
   <dependencies>
     <dependency>
       <groupId>com.gic</groupId>
       <artifactId>gic-cloud-web-service-api</artifactId>
-      <version>3.73</version>
+      <version>3.0-SNAPSHOT</version>
       <scope>compile</scope>
       <exclusions>
         <exclusion>
@@ -25,7 +25,7 @@
     <dependency>
       <groupId>com.gic</groupId>
       <artifactId>gic-cloud-commons</artifactId>
-      <version>3.63</version>
+      <version>3.0-SNAPSHOT</version>
       <scope>compile</scope>
       <exclusions>
         <exclusion>
@@ -41,7 +41,7 @@
     <dependency>
       <groupId>com.gic</groupId>
       <artifactId>gic-platform-config</artifactId>
-      <version>2.19</version>
+      <version>3.0-SNAPSHOT</version>
       <scope>compile</scope>
     </dependency>
     <dependency>

gic-cloud-data-hook-api/src/main/java/com/gic/cloud/data/hook/api/dto/DownloadTask.java

@@ -366,4 +366,24 @@ public class DownloadTask implements Serializable {
 	public void setDownloadCondition(String downloadCondition) {
 		this.downloadCondition = downloadCondition;
 	}
+
+	private Date downloadTime;
+
+	public Date getDownloadTime() {
+		return downloadTime;
+	}
+
+	public void setDownloadTime(Date downloadTime) {
+		this.downloadTime = downloadTime;
+	}
+
+	private Integer downloadWay;
+
+	public Integer getDownloadWay() {
+		return downloadWay;
+	}
+
+	public void setDownloadWay(Integer downloadWay) {
+		this.downloadWay = downloadWay;
+	}
 }

gic-cloud-data-hook-api/src/main/java/com/gic/cloud/data/hook/api/entity/DownloadWayType.java

+package com.gic.cloud.data.hook.api.entity;
+
+public class DownloadWayType {
+    /** 快速通道 */
+    public static final int smallConnect = 0;
+    /** 大查询通道 */
+    public static final int bigConnect = 1;
+    /** 巴拉通道 */
+    public static final int balaConnect = 2;
+}

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

@@ -650,7 +650,7 @@ public class FlatQueryResultServiceImpl implements IFlatQueryResultService {
 								}
 							} // IF OVER
 						} // FOR OVER
-						takeFile(condition, connection);
+						takeFile(condition, connection,DownloadWayType.smallConnect);
 					} // 没有任务则忽略
 				}catch (Exception e){
 					logger.info("异常：{}",e);
@@ -702,7 +702,7 @@ public class FlatQueryResultServiceImpl implements IFlatQueryResultService {
 								}
 							} // IF OVER
 						} // FOR OVER
-						takeFile(condition, connection);
+						takeFile(condition, connection,DownloadWayType.bigConnect);
 						bigTaskRunningMap.remove(condition.getTaskId());
 					} // 没有任务则忽略
 				}catch (Exception e){
@@ -756,7 +756,7 @@ public class FlatQueryResultServiceImpl implements IFlatQueryResultService {
 							} // IF OVER
 						} // FOR OVER
 
-						takeFile(condition, connection);
+						takeFile(condition, connection,DownloadWayType.balaConnect);
 					} // 没有任务则忽略
 				}catch (Exception e){
 					logger.info("异常：{}",e);
@@ -775,11 +775,14 @@ public class FlatQueryResultServiceImpl implements IFlatQueryResultService {
 		}, interval*1000, interval*1000, TimeUnit.MILLISECONDS);
 	}
 
-	private void takeFile(FlatQueryTaskCondition condition, Connection conn){
+	private void takeFile(FlatQueryTaskCondition condition, Connection conn, int downloadType){
 		if (condition != null) {
 			// 更新任务状态
 			DownloadTask task = DownloadTaskServiceImpl.getInstance().getDownloadTaskById(condition.getTaskId());
 			task.setStatus(DownloadTaskStatus.BUILDING);
+			task.setDownloadWay(downloadType);
+			task.setDownloadTime(new Date());
+
 			DownloadTaskServiceImpl.getInstance().updateDownloadTask(task);
 			logger.info("[ runDownloadTask.run ]: {}", "自助指标下载任务执行：" + task.getId());
 			//初始化校验

gic-cloud-data-hook-service/src/main/resources/mapper/DownloadTaskDao.xml

@@ -152,7 +152,9 @@
 			apply_permitted = #{applyPermitted},
 			real_sql = #{realSql},
 			enterprise_id = #{enterpriseId},
-			report_id = #{reportId}
+			report_id = #{reportId},
+			download_time = #{downloadTime},
+			download_way = #{downloadWay}
 		WHERE
 			id = #{id}
 	</update>