Merge remote-tracking branch 'origin/master'

power-fitting/src/main/java/com/gyee/power/fitting/service/custom/curve/DataPrepareService.java

@@ -25,6 +25,7 @@ import org.springframework.scheduling.annotation.Async;
 import org.springframework.stereotype.Service;
 
 import javax.annotation.Resource;
+import java.io.File;
 import java.text.DecimalFormat;
 import java.util.*;
 import java.util.concurrent.TimeUnit;
@@ -87,7 +88,7 @@ public class DataPrepareService {
                 String content = assemble(result);
                 // 处理的数据保存在本地
                 String wtCode = InitialRunner.wtMap.get(wt).getCode();
-                String fileName = config.getFilePathPrepare() + station + "_" + wtCode + "_" + System.currentTimeMillis() / 1000 + ".csv";
+                String fileName = config.getFilePathPrepare() + station + "_" + wtCode + "_" + System.currentTimeMillis() +File.separator+ 1000 + ".csv";
                 boolean flag = FileUtil.writeFile(fileName, content);
                 if (flag){
                     Powerfittinganalysis obj = new Powerfittinganalysis();