Merge branch 'developer' into 'master'

Developer

See merge request !50

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

@@ -114,4 +114,14 @@ public class FreeQueryTaskCondition implements Serializable {
 	public void setDesensiType(Integer desensiType) {
 		this.desensiType = desensiType;
 	}
+
+	private int amount;
+
+	public int getAmount() {
+		return amount;
+	}
+
+	public void setAmount(int amount) {
+		this.amount = amount;
+	}
 }

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

+package com.gic.cloud.data.hook.service;
+
+import com.ctrip.framework.apollo.Config;
+import com.ctrip.framework.apollo.ConfigService;
+
+import java.io.File;
+import java.io.FileInputStream;
+import java.io.IOException;
+import java.io.OutputStream;
+import java.util.List;
+import java.util.zip.ZipEntry;
+import java.util.zip.ZipOutputStream;
+
+public class FileUtil {
+    private static final int BUFFER_SIZE = 2 * 1024;
+
+    /**
+     * 压缩zip
+     * @param srcFiles
+     * @param out
+     * @throws RuntimeException
+     */
+    public static void toZip(List<File> srcFiles, OutputStream out) throws RuntimeException {
+        long start = System.currentTimeMillis();
+        ZipOutputStream zos = null;
+        try {
+            zos = new ZipOutputStream(out);
+            for (File srcFile : srcFiles) {
+                byte[] buf = new byte[BUFFER_SIZE];
+                zos.putNextEntry(new ZipEntry(srcFile.getName()));
+                int len;
+                FileInputStream in = new FileInputStream(srcFile);
+                while ((len = in.read(buf)) != -1) {
+                    zos.write(buf, 0, len);
+                }
+                zos.closeEntry();
+                in.close();
+            }
+            long end = System.currentTimeMillis();
+            System.out.println("压缩完成，耗时：" + (end - start) + " ms");
+        } catch (Exception e) {
+            throw new RuntimeException("zip error from ZipUtils", e);
+        } finally {
+            if (zos != null) {
+                try {
+                    zos.close();
+                } catch (IOException e) {
+                    e.printStackTrace();
+                }
+            }
+        }
+    }
+
+    /**
+     * 获取限制调试
+     * @return
+     */
+    public static Integer getLimitSize(){
+        Config appConfig = ConfigService.getAppConfig();
+        return appConfig.getIntProperty("xls.size.limit", 1000000);
+    }
+}