工具类

src/main/java/com/sooka/sponest/data/digitalresource/service/impl/CenterdataTResourcesLandInfoServiceImpl.java

@@ -13,16 +13,13 @@ import com.sooka.sponest.data.digitalresource.domain.CenterdataTResourcesLandInf
 import com.sooka.sponest.data.digitalresource.mapper.CenterdataTResourcesLandInfoMapper;
 import com.sooka.sponest.data.digitalresource.service.ICenterdataTResourcesLandInfoService;
 import com.sooka.sponest.data.generalbusiness.domain.bo.LatLng;
-import com.sooka.sponest.data.generalbusiness.domain.bo.LatLngAndFlagType;
 import com.sooka.sponest.data.system.areamarking.domain.RegionalFlag;
 import com.sooka.sponest.data.system.areamarking.service.ICenterdataTAreaMarkingService;
+import com.sooka.sponest.data.utils.RegionalFlagUtil;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
-import java.util.ArrayList;
 import java.util.List;
-import java.util.Map;
-import java.util.stream.Collectors;
 
 /**
  * 资源耕地Service业务层处理
@@ -133,28 +130,10 @@ public class CenterdataTResourcesLandInfoServiceImpl extends BaseServiceImpl imp
 
     @Override
     public AjaxResult selectRegionalFlagByEventId(String eventId) {
-        List<LatLngAndFlagType> list = new ArrayList<>();
+
 
         List<RegionalFlag> regionalFlags = centerdataTAreaMarkingService.selectRegionalFlagByEventId(eventId);
-        Map<Long, List<RegionalFlag>> entityMap = regionalFlags.stream()
-                .collect(Collectors.groupingBy(RegionalFlag::getFlagType));//分类
-
-        String name = "";
-        for (Map.Entry<Long, List<RegionalFlag>> entry : entityMap.entrySet()) {
-            List<RegionalFlag> typeEntities = entry.getValue();
-            LatLngAndFlagType latLngAndFlagType = new LatLngAndFlagType();
-            List<String> list1 = new ArrayList<>();
-            for (RegionalFlag entity : typeEntities) {
-                list1.add(entity.getLongitude());
-                list1.add(entity.getLatitude());
-                name = entity.getName();
-            }
-            latLngAndFlagType.setEventId(eventId);
-            latLngAndFlagType.setLatLng(list1);
-            latLngAndFlagType.setName(name);
-            latLngAndFlagType.setFlagType(entry.getKey());
-            list.add(latLngAndFlagType);
-        }
+
 //        List<LatLng> latLngs = new ArrayList<>();
 //        for (RegionalFlag regionalFlag : regionalFlags) {
 //            LatLng latLng = new LatLng();
@@ -162,7 +141,7 @@ public class CenterdataTResourcesLandInfoServiceImpl extends BaseServiceImpl imp
 //            latLng.setLat(regionalFlag.getLatitude());
 //            latLngs.add(latLng);
 //        }
-        return AjaxResult.success(list);
+        return AjaxResult.success(RegionalFlagUtil.getRegionalFlag(regionalFlags,eventId));
     }
 
     @Override

src/main/java/com/sooka/sponest/data/utils/RegionalFlagUtil.java

@@ -0,0 +1,38 @@
+package com.sooka.sponest.data.utils;
+
+import com.sooka.sponest.data.generalbusiness.domain.bo.LatLngAndFlagType;
+import com.sooka.sponest.data.system.areamarking.domain.RegionalFlag;
+
+import java.util.ArrayList;
+import java.util.List;
+import java.util.Map;
+import java.util.stream.Collectors;
+
+public class RegionalFlagUtil {
+
+    public static List<LatLngAndFlagType>  getRegionalFlag(List<RegionalFlag> regionalFlags,String eventId){
+
+        List<LatLngAndFlagType> list = new ArrayList<>();
+
+        Map<Long, List<RegionalFlag>> entityMap = regionalFlags.stream()
+                .collect(Collectors.groupingBy(RegionalFlag::getFlagType));//分类
+
+        String name = "";
+        for (Map.Entry<Long, List<RegionalFlag>> entry : entityMap.entrySet()) {
+            List<RegionalFlag> typeEntities = entry.getValue();
+            LatLngAndFlagType latLngAndFlagType = new LatLngAndFlagType();
+            List<String> list1 = new ArrayList<>();
+            for (RegionalFlag entity : typeEntities) {
+                list1.add(entity.getLongitude());
+                list1.add(entity.getLatitude());
+                name = entity.getName();
+            }
+            latLngAndFlagType.setEventId(eventId);
+            latLngAndFlagType.setLatLng(list1);
+            latLngAndFlagType.setName(name);
+            latLngAndFlagType.setFlagType(entry.getKey());
+            list.add(latLngAndFlagType);
+        }
+        return list;
+    }
+}