调整成员变量

2 files changed, 16 insertions, 31 deletions

diff --git a/src/main/java/cn/ac/iie/service/FileQuery.java b/src/main/java/cn/ac/iie/service/FileQuery.java
index eef9795..97e49a7 100644
--- a/src/main/java/cn/ac/iie/service/FileQuery.java
+++ b/src/main/java/cn/ac/iie/service/FileQuery.java
@@ -28,50 +28,35 @@ import java.util.List;
 public class FileQuery {
     private static final Logger LOG = Logger.getLogger(ListQuery.class);
 
-    private String queryObjType;
-    private String curQueryType;
-
-    private Connection mariaConn;
-    private Statement mariaStat;
-    private MariaDbBase mariaDB;
-
-    private File outputFile;
-    private OutputStream outStream;
-    private OutputStreamWriter outWriter;
-    private InputStreamReader inputStreamReader;
-    private BufferedReader bufferedReader;
-
     long queryNum = 0;
     long dbResultNum = 0;
     long apiResultNum = 0;
     long failedQueryNum = 0;
 
-    public void queryExecutor(String objectType, String queryType, String queryFile, Boolean isLocal) throws SQLException, IOException {
-        this.queryObjType = objectType;
-        this.curQueryType = queryType;
+    public String queryExecutor(String objectType, String queryType, String queryFile, Boolean isLocal) throws SQLException, IOException {
 
-        mariaConn = MariaDBUtils.getConnection();
-        mariaStat = mariaConn.createStatement();
-        mariaDB = new MariaDbBase(mariaConn, mariaStat);
+        Connection mariaConn = MariaDBUtils.getConnection();
+        Statement mariaStat = mariaConn.createStatement();
+        MariaDbBase mariaDB = new MariaDbBase(mariaConn, mariaStat);
 
         // 文件读取
-        inputStreamReader = new InputStreamReader(
+        InputStreamReader inputStreamReader = new InputStreamReader(
                 new FileInputStream(queryFile), "GBK");
-        bufferedReader = new BufferedReader(inputStreamReader);
+        BufferedReader bufferedReader = new BufferedReader(inputStreamReader);
         File importFile = new File(queryFile);
         String importFileName = FileUtils.getFileName(importFile);
         Long fileLineNum = FileUtils.getFileLineNum(importFile);
         LOG.info("[File query]-" +  importFileName + ": File Found.");
-        LOG.info("[File query]-" +  curQueryType + ".");
-        String outputFileName = importFileName + "." + curQueryType + ".result";
+        LOG.info("[File query]-" + queryType + ".");
+        String outputFileName = importFileName + "." + queryType + ".result";
         JsonTool jsonTool = new JsonTool();
 
-        outputFile = new File(ApplicationConfig.QUERY_OUTPUT_DIR + "/" + outputFileName);
+        File outputFile = new File(ApplicationConfig.QUERY_OUTPUT_DIR + "/" + outputFileName);
         if (!outputFile.exists()) {
             FileUtils.createFile(new File(ApplicationConfig.QUERY_OUTPUT_DIR), outputFileName);
         }
-        outStream = new FileOutputStream(outputFile);
-        outWriter = new OutputStreamWriter(outStream, StandardCharsets.UTF_8);
+        OutputStream outStream = new FileOutputStream(outputFile);
+        OutputStreamWriter outWriter = new OutputStreamWriter(outStream, StandardCharsets.UTF_8);
         outWriter.write("[\n");
 
         LOG.info("[File query]-Start query! Progress: 0.00%");
@@ -102,13 +87,13 @@ public class FileQuery {
             // 进度日志
             if(batch_index * ApplicationConfig.QUERY_READIN_BATCH % ApplicationConfig.QUERY_LOG_FILE_LINE_INTERVAL == 0){
                 String percent = new DecimalFormat("##.00%").format((float) queryNum / fileLineNum);
-                LOG.info("[File query]-" + curQueryType + "-"+ importFileName + " Progress:" + percent);
+                LOG.info("[File query]-" + queryType + "-"+ importFileName + " Progress:" + percent);
             }
 
             batch_index ++;
         }
 
-        LOG.info("[File query]-" + curQueryType + "-" + importFileName + " "
+        LOG.info("[File query]-" + queryType + "-" + importFileName + " "
                 + "Query result: submit " + queryNum + " valid objects, "
                 + dbResultNum + " (" + new DecimalFormat("##.0%").format((float) dbResultNum / queryNum) + ")" + " results from database，"
                 + apiResultNum + " (" + new DecimalFormat("##.0%").format((float) apiResultNum / queryNum) + ")" + " results from bright cloud. "
@@ -118,8 +103,9 @@ public class FileQuery {
         outWriter.write("\n]");
         FileUtils.writerClose(outWriter, outStream);
         FileUtils.readerClose(bufferedReader, inputStreamReader);
-
         MariaDBUtils.close(mariaStat, mariaConn);
+
+        return resultJson.toJSONString();
     }
 
 
diff --git a/src/main/java/cn/ac/iie/service/ListQuery.java b/src/main/java/cn/ac/iie/service/ListQuery.java
index 49b43f0..cba3976 100644
--- a/src/main/java/cn/ac/iie/service/ListQuery.java
+++ b/src/main/java/cn/ac/iie/service/ListQuery.java
@@ -38,7 +38,6 @@ public class ListQuery {
     private List<String> queryObjects;
     private String curQueryType;
 
-    private Statement mariaStat;
     private MariaDbBase mariaDB;
 
     long queryNum;
@@ -57,7 +56,7 @@ public class ListQuery {
         JSONArray json = null;
 
         Connection mariaConn = MariaDBUtils.getConnection();
-        mariaStat = mariaConn.createStatement();
+        Statement mariaStat = mariaConn.createStatement();
         mariaDB = new MariaDbBase(mariaConn, mariaStat);
 
         // 校验