取数平台调整

gic-cloud-data-hook-api/src/main/java/com/gic/cloud/data/hook/api/service/IFreeQueryService.java

@@ -79,4 +79,10 @@ public interface IFreeQueryService {
 	FreeQuerySource getFreeQuerySource(String enterpriseId);
 
 	void initTask();
+
+	List<String> listFilterPhoneField();
+
+	List<String> listFilterPhoneAndCardNoField();
+
+	List<String> listFilterUserName();
 }

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

@@ -58,7 +58,7 @@ public class FlatQueryResultServiceImpl implements IFlatQueryResultService {
 	private static LogPak log = new LogPak(FlatQueryResultServiceImpl.class);
 
 	/** csv / xls 下载目录 */
-	public static final String SAVE_FOLDER = "C:\\Users\\d\\Desktop\\企业";
+	public static final String SAVE_FOLDER = "/usr/local/data-hook-file";
 
 	public static final List<String> PHONE = Arrays.asList("mobile", "phone", "phone_number", "receive_phone_number");
 

gic-cloud-data-hook/src/main/java/com/gic/cloud/data/hook/web/FreeQueryController.java

@@ -160,6 +160,31 @@ public class FreeQueryController {
 		dto.setStartTime(new Date());
 		Integer dataPermission = this.enterpriseService.getEnterpriseSettingByEnterpriseId(SessionContextUtils.getLoginUserEnterpriseId()).getDataPermission();
 		System.out.println("!!!!!!!!:"+dataPermission);
+		sql = parseSql(sql);
+		FreeQueryResult freeQueryResult = this.freeQueryService.getFreeQueryResult(sql, enterpriseId, queryDataType, dataPermission);
+		dto.setEndTime(new Date());
+		this.searchLogService.saveLog(dto);
+		return freeQueryResult;
+	}
+
+
+	/** 生成自助查询下载任务
+	 * @param userId
+	 * @param name
+	 * @param amount
+	 * @param format
+	 * @param sql
+	 * @param request
+	 * @param response
+	 * @return
+	 */
+	@RequestMapping("/build-free-query-download-task")
+	public DownloadTask buildDownloadTask(String userId, String name, Integer amount, String format, String sql, String enterpriseId, Boolean useCompress, Integer dataType, String applyId, Integer desensiType, HttpServletRequest request, HttpServletResponse response) {
+		sql = parseSql(sql);
+		return this.freeQueryService.buildFreeQueryDownloadTask(userId, name, amount, format, sql, enterpriseId, useCompress, dataType, applyId, desensiType);
+	}
+
+	private String parseSql(String sql){
 		String curLimit = "1000";
 		if(sql.indexOf("information_schema.columns") > 0){
 			sql = "SELECT tmpTable.* FROM (" + sql + ") AS tmpTable LIMIT 1000";
@@ -181,28 +206,7 @@ public class FreeQueryController {
 			}
 			sql = sql + " limit " + curLimit;
 		}
-
-
-		FreeQueryResult freeQueryResult = this.freeQueryService.getFreeQueryResult(sql, enterpriseId, queryDataType, dataPermission);
-		dto.setEndTime(new Date());
-		this.searchLogService.saveLog(dto);
-		return freeQueryResult;
-	}
-
-
-	/** 生成自助查询下载任务
-	 * @param userId
-	 * @param name
-	 * @param amount
-	 * @param format
-	 * @param sql
-	 * @param request
-	 * @param response
-	 * @return
-	 */
-	@RequestMapping("/build-free-query-download-task")
-	public DownloadTask buildDownloadTask(String userId, String name, Integer amount, String format, String sql, String enterpriseId, Boolean useCompress, Integer dataType, String applyId, Integer desensiType, HttpServletRequest request, HttpServletResponse response) {
-		return this.freeQueryService.buildFreeQueryDownloadTask(userId, name, amount, format, sql, enterpriseId, useCompress, dataType, applyId, desensiType);
+		return sql;
 	}
 
 	/** 获取指定表明的所有字段