修改项目信息经纬度存储

neim-biz/src/main/java/com/jiayue/biz/domain/ProjectBasicInfo.java

@@ -26,5 +26,7 @@ public class ProjectBasicInfo {
     private String projectOverview;
     //项目风力概述
     private String resourcesOverview;
+    //项目经纬度
+    private String position;
 
 }

neim-biz/src/main/java/com/jiayue/biz/domain/ProjectInfo.java

@@ -17,8 +17,6 @@ import java.util.List;
 public class ProjectInfo {
 
     private String id;
-    //项目经纬度
-    private String position;
     //基本信息
     private ProjectBasicInfo projectBasicInfo;
     //关联设备

neim-biz/src/main/java/com/jiayue/biz/service/impl/HomePageServiceImpl.java

@@ -770,10 +770,11 @@ public class HomePageServiceImpl extends ServiceImpl<WindTowerDataParentTableMap
         ArrayList<List<List<Coordinates>>> coordinateList = new ArrayList<>();
         //风机List
         ArrayList<FanTower> fanList = new ArrayList<>();
+
         for (ProjectInfo projectInfo : projectInfoList) {
             //拐点坐标
             coordinateList.add(projectInfo.getCoordinates());
-
+            ArrayList<String> projectIdList = new ArrayList<>();
             if (projectInfo.getEquipment() != null && projectInfo.getEquipment().size() > 0) {
                 //循环测风塔信息
                 for (Equipment equipment : projectInfo.getEquipment()) {
@@ -787,10 +788,10 @@ public class HomePageServiceImpl extends ServiceImpl<WindTowerDataParentTableMap
                     map.put("projectId", projectInfo.getId());
                     towerList.add(map);
                 }
-
             }
         }
 
+
         dataMap.put("towerList", towerList);
         dataMap.put("coordinatesList", coordinateList);
 
@@ -929,13 +930,14 @@ public class HomePageServiceImpl extends ServiceImpl<WindTowerDataParentTableMap
         //获取项目信息
         List<ProjectInfo> projectInfoList = projectInfoService.getProjectInfoList();
         for (ProjectInfo projectInfo : projectInfoList) {
+            HashMap<String, Object> map = new HashMap<>();
+            if (StrUtil.isNotBlank(projectInfo.getProjectBasicInfo().getPosition())) {
+                String[] split = projectInfo.getProjectBasicInfo().getPosition().split(",");
+                map.put("longitude", split[0]);
+                map.put("latitude", split[1]);
+            }
             if (projectInfo.getEquipment() != null && projectInfo.getEquipment().size() > 0) {
-                HashMap<String, Object> map = new HashMap<>();
-                if (StrUtil.isNotBlank(projectInfo.getPosition())) {
-                    String[] split = projectInfo.getPosition().split(",");
-                    map.put("longitude", split[0]);
-                    map.put("latitude", split[1]);
-                }
+
                 map.put("id", projectInfo.getId());
                 map.put("projectNameEasy", projectInfo.getProjectBasicInfo().getProjectNameEasy());
                 map.put("projectName", projectInfo.getProjectBasicInfo().getProjectName());