Merge remote-tracking branch 'origin/master'

# Conflicts:
#	config/application.properties
#	src/main/java/com/sy/IMF/IMF_Tesk.java
#	src/main/java/com/sy/IMF/KAKO_Sender.java

@@ -83,6 +83,9 @@ public class LogicOperation {
      * @Result 计算卡口采集数据并发送报文
      */
     public static boolean operation(GatherInfo info) {
+        if("综保区".equals(info.getAreaid())){
+            //todo 加综保区的判断逻辑
+        }
         PropertyConfigurator.configure("config/log4j.properties");
         boolean result = false;
         //转为double类型

@@ -4,8 +4,7 @@ import com.sy.model.LandBusinessTypeList;
 import com.sy.utils.DateTimeConverter;
 import com.sy.utils.FileTool;
 
-import java.io.FileWriter;
-import java.io.IOException;
+import java.io.*;
 
 /**
  * @author
@@ -18,12 +17,19 @@ public class VeManifestRelation {
 
     public static boolean createFile(LandBusinessTypeList landBusinessTypeList){
         boolean flag = false;
-        FileWriter fileWriter;
+//        FileWriter fileWriter;
+        File file;
         try {
-            fileWriter = new FileWriter(veManifestDirectory+new DateTimeConverter().dateFormat()+".xml");
-            fileWriter.write(new VeManifestRelation().getMsg(landBusinessTypeList));
-            fileWriter.flush();
-            fileWriter.close();
+//            fileWriter = new FileWriter(veManifestDirectory+new DateTimeConverter().dateFormat()+".xml");
+//
+//            fileWriter.write(new VeManifestRelation().getMsg(landBusinessTypeList));
+//            fileWriter.flush();
+//            fileWriter.close();
+            file = new File(veManifestDirectory+new DateTimeConverter().dateFormat()+".xml");
+            Writer writer = new BufferedWriter(new OutputStreamWriter(new FileOutputStream(file),"UTF-8"));
+            writer.write(new VeManifestRelation().getMsg(landBusinessTypeList));
+            writer.flush();
+            writer.close();
             flag = true;
         }catch (IOException e){
             e.printStackTrace();

-package com.sy;
-
-/**
- * @author
- * @time 2019-${MOUTH}-06 17:59
- */
-public class test {
-
- //   private static LogicOperation logicOperation =new LogicOperation();
-
-/*    public static void main(String[] args) {
-       double a =  logicOperation.GoodsWt("172-26481560,172-26481593,172-26481604,172-26481545,172-26481582,172-26481556,172-26481571","I");
-       System.out.printf("%.1f",a);
-    }*/
-}