数据中心

data-ui/src/views/data/generalbusiness/keyProjects/index.vue

@@ -562,10 +562,10 @@
         <el-row :gutter="24">
           <el-col :span="12">
             <el-form-item label="项目名称" prop="projectName">
-              <el-input v-model="form.projectName" maxlength="50" readonly/>
+              <el-input v-model="form.projectName" maxlength="50" disabled/>
             </el-form-item>
             <el-form-item label="经度" prop="longitude">
-              <el-input v-model="form.longitude" maxlength="32" readonly/>
+              <el-input v-model="form.longitude" maxlength="32" disabled/>
             </el-form-item>
             <el-form-item label="属地辖区" prop="territoriality">
               <el-select v-model="form.territoriality" maxlength="32" disabled>

src/main/java/com/sooka/sponest/data/digitalforest/controller/CenterdataTAfforestationTaskController.java

@@ -11,6 +11,7 @@ import com.sooka.sponest.data.digitalforest.domain.CenterdataTAfforestationTask;
 import com.sooka.sponest.data.digitalforest.domain.bo.AfforestationBO;
 import com.sooka.sponest.data.digitalforest.domain.vo.AfforestationVO;
 import com.sooka.sponest.data.digitalforest.service.ICenterdataTAfforestationTaskService;
+import com.sooka.sponest.data.generalbusiness.domain.bo.LatLngAndFlagType;
 import com.sooka.sponest.data.utils.ExcelUtil;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiImplicitParam;
@@ -165,7 +166,7 @@ public class CenterdataTAfforestationTaskController extends BaseController {
      */
     @ApiOperation(value = "根据计划id查询造林区域",notes ="根据计划id查询造林区域" )
     @PostMapping("/getAfforestationArea")
-    public R<List<AfforestationBO>> getAfforestationArea(@RequestBody AfforestationVO vo) {
+    public R<List<LatLngAndFlagType>> getAfforestationArea(@RequestBody AfforestationVO vo) {
         return R.ok(centerdataTAfforestationTaskService.getAfforestationArea(vo));
     }
 

src/main/java/com/sooka/sponest/data/digitalforest/mapper/CenterdataTAfforestationTaskMapper.java

@@ -3,6 +3,7 @@ package com.sooka.sponest.data.digitalforest.mapper;
 import com.sooka.sponest.data.digitalforest.domain.CenterdataTAfforestationTask;
 import com.sooka.sponest.data.digitalforest.domain.bo.AfforestationBO;
 import com.sooka.sponest.data.digitalforest.domain.vo.AfforestationVO;
+import com.sooka.sponest.data.system.areamarking.domain.RegionalFlag;
 
 import java.util.List;
 
@@ -64,5 +65,5 @@ public interface CenterdataTAfforestationTaskMapper {
 
     public List<AfforestationBO> getAfforestation(AfforestationVO vo);
 
-    public List<AfforestationBO> getAfforestationArea(AfforestationVO vo);
+    public List<RegionalFlag> getAfforestationArea(AfforestationVO vo);
 }

src/main/java/com/sooka/sponest/data/digitalforest/service/ICenterdataTAfforestationTaskService.java

@@ -4,6 +4,7 @@ import com.sooka.sponest.data.base.service.IBaseService;
 import com.sooka.sponest.data.digitalforest.domain.CenterdataTAfforestationTask;
 import com.sooka.sponest.data.digitalforest.domain.bo.AfforestationBO;
 import com.sooka.sponest.data.digitalforest.domain.vo.AfforestationVO;
+import com.sooka.sponest.data.generalbusiness.domain.bo.LatLngAndFlagType;
 
 import java.util.List;
 
@@ -73,5 +74,5 @@ public interface ICenterdataTAfforestationTaskService extends IBaseService {
 
     public List<AfforestationBO> getAfforestation(AfforestationVO vo);
 
-    public List<AfforestationBO> getAfforestationArea(AfforestationVO vo);
+    public List<LatLngAndFlagType> getAfforestationArea(AfforestationVO vo);
 }

src/main/java/com/sooka/sponest/data/digitalforest/service/impl/CenterdataTAfforestationTaskServiceImpl.java

@@ -14,6 +14,9 @@ import com.sooka.sponest.data.digitalforest.domain.vo.AfforestationVO;
 import com.sooka.sponest.data.digitalforest.mapper.CenterdataTAfforestationDoneMapper;
 import com.sooka.sponest.data.digitalforest.mapper.CenterdataTAfforestationTaskMapper;
 import com.sooka.sponest.data.digitalforest.service.ICenterdataTAfforestationTaskService;
+import com.sooka.sponest.data.generalbusiness.domain.bo.LatLngAndFlagType;
+import com.sooka.sponest.data.system.areamarking.domain.RegionalFlag;
+import com.sooka.sponest.data.utils.RegionalFlagUtil;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
@@ -187,8 +190,9 @@ public class CenterdataTAfforestationTaskServiceImpl extends BaseServiceImpl imp
     }
 
     @Override
-    public List<AfforestationBO> getAfforestationArea(AfforestationVO vo) {
+    public List<LatLngAndFlagType> getAfforestationArea(AfforestationVO vo) {
         setSookaDataBase(vo);
-        return centerdataTAfforestationTaskMapper.getAfforestationArea(vo);
+        List<RegionalFlag> list = centerdataTAfforestationTaskMapper.getAfforestationArea(vo);
+        return RegionalFlagUtil.getRegionalFlag(list,vo.getAfforestationId());
     }
 }

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

@@ -1,6 +1,7 @@
 package com.sooka.sponest.data.digitalwater.mapper;
 
 import com.sooka.sponest.data.digitalwater.domain.WaterConservancyViewBO;
+import com.sooka.sponest.data.system.areamarking.domain.RegionalFlag;
 
 import java.util.List;
 import java.util.Map;
@@ -19,9 +20,9 @@ public interface WaterConservancyViewMapper {
 
     List<Map<String, Object>> getGridList(WaterConservancyViewBO waterConservancyViewBO);
 
-    List<Map<String, Object>> getLandList(WaterConservancyViewBO waterConservancyViewBO);
+    List<RegionalFlag> getLandList(WaterConservancyViewBO waterConservancyViewBO);
 
     List<Map<String, Object>> getFarmLandList(WaterConservancyViewBO waterConservancyViewBO);
 
-    List<Map<String, Object>> getFlagList(WaterConservancyViewBO waterConservancyViewBO);
+    List<RegionalFlag> getFlagList(WaterConservancyViewBO waterConservancyViewBO);
 }

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

@@ -2,6 +2,7 @@ package com.sooka.sponest.data.digitalwater.service;
 
 import com.sooka.sponest.data.base.service.IBaseService;
 import com.sooka.sponest.data.digitalwater.domain.WaterConservancyViewBO;
+import com.sooka.sponest.data.generalbusiness.domain.bo.LatLngAndFlagType;
 
 import java.util.List;
 import java.util.Map;
@@ -28,11 +29,11 @@ public interface IWaterViewService extends IBaseService {
 
     List<Map<String, Object>> getGridList(WaterConservancyViewBO waterConservancyViewBO);
 
-    List<Map<String, Object>> getLandList(WaterConservancyViewBO waterConservancyViewBO);
+    List<LatLngAndFlagType> getLandList(WaterConservancyViewBO waterConservancyViewBO);
 
     List<Map<String, Object>> getFarmList(WaterConservancyViewBO waterConservancyViewBO);
 
-    List<Map<String, Object>> getFlagList(WaterConservancyViewBO waterConservancyViewBO);
+    List<LatLngAndFlagType> getFlagList(WaterConservancyViewBO waterConservancyViewBO);
 
     void dataFilter(List<Map<String, Object>> pointList);
 }

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

@@ -6,7 +6,10 @@ import com.sooka.sponest.data.digitalwater.domain.WaterConservancyViewBO;
 import com.sooka.sponest.data.digitalwater.mapper.CenterdataTHydraulicReachMapper;
 import com.sooka.sponest.data.digitalwater.mapper.WaterConservancyViewMapper;
 import com.sooka.sponest.data.digitalwater.service.IWaterViewService;
+import com.sooka.sponest.data.generalbusiness.domain.bo.LatLngAndFlagType;
+import com.sooka.sponest.data.system.areamarking.domain.RegionalFlag;
 import com.sooka.sponest.data.utils.DataConstants;
+import com.sooka.sponest.data.utils.RegionalFlagUtil;
 import org.apache.commons.collections4.MapUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
@@ -146,9 +149,10 @@ public class WaterViewServiceImpl extends BaseServiceImpl implements IWaterViewS
 
     @DataScopeMutiDept(deptAlias = "d")
     @Override
-    public List<Map<String, Object>> getLandList(WaterConservancyViewBO waterConservancyViewBO) {
+    public List<LatLngAndFlagType> getLandList(WaterConservancyViewBO waterConservancyViewBO) {
         setSookaDataBase(waterConservancyViewBO);
-        return waterConservancyViewMapper.getLandList(waterConservancyViewBO);
+        List<RegionalFlag> list = waterConservancyViewMapper.getLandList(waterConservancyViewBO);
+        return RegionalFlagUtil.getRegionalFlag(list,waterConservancyViewBO.getId());
     }
 
     @DataScopeMutiDept(deptAlias = "d")
@@ -160,8 +164,9 @@ public class WaterViewServiceImpl extends BaseServiceImpl implements IWaterViewS
 
     @DataScopeMutiDept(deptAlias = "d")
     @Override
-    public List<Map<String, Object>> getFlagList(WaterConservancyViewBO waterConservancyViewBO) {
+    public List<LatLngAndFlagType> getFlagList(WaterConservancyViewBO waterConservancyViewBO) {
         setSookaDataBase(waterConservancyViewBO);
-        return waterConservancyViewMapper.getFlagList(waterConservancyViewBO);
+        List<RegionalFlag> list = waterConservancyViewMapper.getFlagList(waterConservancyViewBO);
+        return RegionalFlagUtil.getRegionalFlag(list,waterConservancyViewBO.getId());
     }
 }

src/main/java/com/sooka/sponest/data/generalbusiness/controller/CenterdataTForestImportareaController.java

@@ -197,8 +197,8 @@ public class CenterdataTForestImportareaController extends BaseController {
     })
     @ApiOperation(value = "远端调用重点区域查询区域标记", notes = "远端调用重点区域查询区域标记")
     @GetMapping(value = "/getRegionalFlagFeign/{eventId}")
-    public R getRegionalFlagFeign(@PathVariable("eventId") String eventId) {
-        return R.ok(centerdataTForestImportareaService.selectRegionalFlagByEventId(eventId));
+    public AjaxResult getRegionalFlagFeign(@PathVariable("eventId") String eventId) {
+        return centerdataTForestImportareaService.selectRegionalFlagByEventId(eventId);
     }
 
     // 删除区域标记

src/main/java/com/sooka/sponest/data/generalbusiness/service/impl/CenterdataTForestImportareaServiceImpl.java

@@ -12,12 +12,14 @@ import com.sooka.sponest.data.base.service.impl.BaseServiceImpl;
 import com.sooka.sponest.data.digitalforest.domain.bo.VisuForestCloudEventTypeBO;
 import com.sooka.sponest.data.generalbusiness.domain.CenterdataTForestImportarea;
 import com.sooka.sponest.data.generalbusiness.domain.bo.LatLng;
+import com.sooka.sponest.data.generalbusiness.domain.bo.LatLngAndFlagType;
 import com.sooka.sponest.data.generalbusiness.mapper.CenterdataTForestImportareaMapper;
 import com.sooka.sponest.data.generalbusiness.service.ICenterdataTForestImportareaService;
 import com.sooka.sponest.data.system.areamarking.domain.RegionalFlag;
 import com.sooka.sponest.data.system.areamarking.service.ICenterdataTAreaMarkingService;
 import com.sooka.sponest.data.system.equipment.domain.CenterdataTEquipmentCamera;
 import com.sooka.sponest.data.system.equipment.service.ICenterdataTEquipmentCameraService;
+import com.sooka.sponest.data.utils.RegionalFlagUtil;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
@@ -167,10 +169,9 @@ public class CenterdataTForestImportareaServiceImpl extends BaseServiceImpl impl
     // 查询区域标记
     @Override
     public AjaxResult selectRegionalFlagByEventId(String eventId) {
-        RegionalFlag regionalFlagnew =new RegionalFlag();
 
         List<RegionalFlag> regionalFlags = centerdataTAreaMarkingService.selectRegionalFlagByEventId(eventId);
-        List<LatLng> latLngs = new ArrayList<>();
+        /*List<LatLng> latLngs = new ArrayList<>();
         for (RegionalFlag regionalFlag : regionalFlags) {
             LatLng latLng = new LatLng();
             latLng.setLng(regionalFlag.getLongitude());
@@ -179,8 +180,9 @@ public class CenterdataTForestImportareaServiceImpl extends BaseServiceImpl impl
         }
         String latLng = JSONObject.toJSONString(latLngs);
         regionalFlagnew.setLatLngs(latLng);
-        regionalFlagnew.setEventId(eventId);
-        return AjaxResult.success(regionalFlagnew);
+        regionalFlagnew.setEventId(eventId);*/
+        List<LatLngAndFlagType> list = RegionalFlagUtil.getRegionalFlag(regionalFlags,eventId);
+        return AjaxResult.success(list);
     }
 
     // 删除区域标记

src/main/resources/mapper/digitalforest/CenterdataTAfforestationTaskMapper.xml

@@ -206,9 +206,14 @@
         where  DATE_FORMAT(plan_start_time,'%Y')=#{year} ${params.dataScope}
     </select>
 
-    <select id="getAfforestationArea" parameterType="AfforestationVO" resultType="com.sooka.sponest.data.digitalforest.domain.bo.AfforestationBO">
-        select  points from
-        centerdata_t_forest_afforestationarea
+    <select id="getAfforestationArea" parameterType="AfforestationVO" resultType="com.sooka.sponest.data.system.areamarking.domain.RegionalFlag">
+        select
+        b.flag_type flagType,
+        b.longitude,
+        b.latitude
+        from
+        centerdata_t_forest_afforestationarea a
+		left join centerdata_t_regional_flag b on a.id = b.event_id
         where afforestation_id=#{afforestationId}
     </select>
 </mapper>

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="map">
+    <select id="getLandList" parameterType="WaterConservancyViewBO" resultType="com.sooka.sponest.data.system.areamarking.domain.RegionalFlag">
        SELECT
             a.id,
             a.`name`
@@ -167,7 +167,14 @@
         where a.id = #{gridLandId} ${params.dataScope}
     </select>
 
-    <select id="getFlagList" parameterType="WaterConservancyViewBO" resultType="map">
-       SELECT longitude lng,latitude lat FROM centerdata_t_regional_flag WHERE event_id = #{id} ORDER by flag
+    <select id="getFlagList" parameterType="WaterConservancyViewBO" resultType="com.sooka.sponest.data.system.areamarking.domain.RegionalFlag">
+       SELECT
+            flag_type flagType,
+            longitude lng,
+            latitude lat
+        FROM
+            centerdata_t_regional_flag
+        WHERE
+            event_id = #{id} ORDER by flag
     </select>
 </mapper>