优化

power-fitting/src/main/java/com/gyee/power/fitting/common/util/FileUtil.java

@@ -26,7 +26,7 @@ public class FileUtil {
         try {
             File file = new File(fileName);
             if (!file.exists()) {
-                fileName = fileName.substring(0, fileName.lastIndexOf("\\"));
+                fileName = fileName.substring(0, fileName.lastIndexOf(File.separator));
                 File file1 = new File(fileName);
                 file1.mkdirs();
                 file.createNewFile();

power-fitting/src/main/java/com/gyee/power/fitting/common/util/NumberUtil.java

@@ -99,6 +99,9 @@ public class NumberUtil {
             case 600:
                 interval = "十分钟";
                 break;
+            case 900:
+                interval = "十五分钟";
+                break;
             default:
                 interval = "一分钟";
         }

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.ArrayList;
 import java.util.HashMap;
@@ -81,7 +82,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){  // TODO  保存数据库
                     Powerfittinganalysis obj = new Powerfittinganalysis();