项目位置更改为position属性

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

@@ -747,9 +747,14 @@ public class HomePageServiceImpl extends ServiceImpl<WindTowerDataParentTableMap
             for (ProjectInfo projectInfo : collect) {
                 dataMap.put("projectOverview", projectInfo.getProjectBasicInfo().getProjectOverview());
                 dataMap.put("resourcesOverview", projectInfo.getProjectBasicInfo().getResourcesOverview());
-                if (projectInfo.getEquipment() != null && projectInfo.getEquipment().size() > 0) {
-                    dataMap.put("longitude", projectInfo.getEquipment().get(0).getLongitude());
-                    dataMap.put("latitude", projectInfo.getEquipment().get(0).getLatitude());
+//                if (projectInfo.getEquipment() != null && projectInfo.getEquipment().size() > 0) {
+//                    dataMap.put("longitude", projectInfo.getEquipment().get(0).getLongitude());
+//                    dataMap.put("latitude", projectInfo.getEquipment().get(0).getLatitude());
+//                }
+                if (StrUtil.isNotBlank(projectInfo.getProjectBasicInfo().getPosition())) {
+                    String[] split = projectInfo.getProjectBasicInfo().getPosition().split(",");
+                    dataMap.put("longitude", split[0]);
+                    dataMap.put("latitude", split[1]);
                 }
             }
         }
@@ -934,15 +939,16 @@ public class HomePageServiceImpl extends ServiceImpl<WindTowerDataParentTableMap
         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) {
                 map.put("id", projectInfo.getId());
                 map.put("projectNameEasy", projectInfo.getProjectBasicInfo().getProjectNameEasy());
                 map.put("projectName", projectInfo.getProjectBasicInfo().getProjectName());
+                String[] split = projectInfo.getProjectBasicInfo().getPosition().split(",");
+                map.put("longitude", split[0]);
+                map.put("latitude", split[1]);
             }
+//            if (projectInfo.getEquipment() != null && projectInfo.getEquipment().size() > 0) {
+//
+//            }
             arrayList.add(map);
         }
         return arrayList;