1.风机坐标上传优化

neim-biz/src/main/java/com/jiayue/biz/controller/HomePageController.java

@@ -319,7 +319,7 @@ public class HomePageController extends BaseController {
             String xiangmuStr = fileStrList.get(0);
             if (xiangmuStr.startsWith("xiangmu")) {
                 log.info("上传文件项目信息：{}", xiangmuStr);
-                String[] xiangmuStrArr = xiangmuStr.split(" ");
+                String[] xiangmuStrArr = xiangmuStr.split("\t");
                 if (null != xiangmuStrArr && xiangmuStrArr.length == 4) {
 
                     String projectId = xiangmuStrArr[1];
@@ -340,7 +340,7 @@ public class HomePageController extends BaseController {
             String coordinatesStr = fileStrList.get(1);
             if (coordinatesStr.startsWith("guaidian")) {
                 log.info("上传文件拐点坐标信息：{}", coordinatesStr);
-                String[] coordinatesStrArr = coordinatesStr.split(" ");
+                String[] coordinatesStrArr = coordinatesStr.split("\t");
                 if (null != coordinatesStrArr && coordinatesStrArr.length == 2) {
                     List<List<Coordinates>> coLists = new ArrayList<>();
                     List<Coordinates> coSubLists = new ArrayList<>();
@@ -359,20 +359,22 @@ public class HomePageController extends BaseController {
                     return success("读取文件内容不正确，项目拐点坐标填写不正确：" + coordinatesStr);
                 }
 
-            } else {
-                return success("读取文件内容不正确，未填写项目信息");
             }
             //风机型号
             String fjTypeStr = fileStrList.get(2);
             if (fjTypeStr.startsWith("fengji")) {
                 log.info("上传文件风机型号信息：{}", fjTypeStr);
-                String fjType = fjTypeStr.substring(6);
+                String fjType = fjTypeStr.split("\t")[1];
                 log.info("上传文件风机型号：{}", fjType);
                 List<FanTower> fanTowerList = new ArrayList<>();
                 for (int i = 3; i < fileStrList.size(); i++) {
                     String fjStr = fileStrList.get(i);
                     if (StrUtil.isNotBlank(fjStr)) {
-                        String[] fjStrArr = fjStr.split(" ");
+                        if (fjStr.startsWith("fengji")) {
+                            fjType = fjStr.split("\t")[1];
+                            continue;
+                        }
+                        String[] fjStrArr = fjStr.split("\t");
                         FanTower fanTower = new FanTower();
                         fanTower.setId(UUID.randomUUID().toString());
                         fanTower.setFanModel(fjType);