数据中心

src/main/java/com/sooka/sponest/data/digitalwater/mapper/WaterConservancyViewMapper.java

@@ -20,7 +20,7 @@ public interface WaterConservancyViewMapper {
 
     List<Map<String, Object>> getGridList(WaterConservancyViewBO waterConservancyViewBO);
 
-    List<RegionalFlag> getLandList(WaterConservancyViewBO waterConservancyViewBO);
+    List<Map<String, Object>> getLandList(WaterConservancyViewBO waterConservancyViewBO);
 
     List<Map<String, Object>> getFarmLandList(WaterConservancyViewBO waterConservancyViewBO);
 

src/main/java/com/sooka/sponest/data/digitalwater/service/IWaterViewService.java

@@ -29,7 +29,7 @@ public interface IWaterViewService extends IBaseService {
 
     List<Map<String, Object>> getGridList(WaterConservancyViewBO waterConservancyViewBO);
 
-    List<LatLngAndFlagType> getLandList(WaterConservancyViewBO waterConservancyViewBO);
+    List<Map<String, Object>> getLandList(WaterConservancyViewBO waterConservancyViewBO);
 
     List<Map<String, Object>> getFarmList(WaterConservancyViewBO waterConservancyViewBO);
 

src/main/java/com/sooka/sponest/data/digitalwater/service/impl/WaterViewServiceImpl.java

@@ -149,10 +149,9 @@ public class WaterViewServiceImpl extends BaseServiceImpl implements IWaterViewS
 
     @DataScopeMutiDept(deptAlias = "d")
     @Override
-    public List<LatLngAndFlagType> getLandList(WaterConservancyViewBO waterConservancyViewBO) {
+    public List<Map<String, Object>> getLandList(WaterConservancyViewBO waterConservancyViewBO) {
         setSookaDataBase(waterConservancyViewBO);
-        List<RegionalFlag> list = waterConservancyViewMapper.getLandList(waterConservancyViewBO);
-        return RegionalFlagUtil.getRegionalFlag(list,waterConservancyViewBO.getId());
+        return waterConservancyViewMapper.getLandList(waterConservancyViewBO);
     }
 
     @DataScopeMutiDept(deptAlias = "d")

src/main/resources/mapper/digitalwater/WaterConservancyViewMapper.xml

@@ -147,7 +147,7 @@
             a.id IN (#{gridId}) and a.type = #{leadType} ${params.dataScope}
     </select>
 
-    <select id="getLandList" parameterType="WaterConservancyViewBO" resultType="com.sooka.sponest.data.system.areamarking.domain.RegionalFlag">
+    <select id="getLandList" parameterType="WaterConservancyViewBO" resultType="map">
        SELECT
             a.id,
             a.`name`
@@ -170,8 +170,8 @@
     <select id="getFlagList" parameterType="WaterConservancyViewBO" resultType="com.sooka.sponest.data.system.areamarking.domain.RegionalFlag">
        SELECT
             flag_type flagType,
-            longitude lng,
-            latitude lat
+            longitude longitude,
+            latitude latitude
         FROM
             centerdata_t_regional_flag
         WHERE