Merge branch 'dev' of http://114.244.114.158:8802/siwei/sanya-data-management-back into dev

onemap-modules/onemap-apply/src/main/java/com/onemap/apply/controller/gdbh/GdbhController.java

@@ -11,6 +11,7 @@ import org.springframework.web.bind.annotation.*;
 
 import java.util.Arrays;
 import java.util.List;
+import java.util.Map;
 
 @RestController
 @RequestMapping("/gdbh")
@@ -101,5 +102,9 @@ public class GdbhController extends BaseController {
         List<GdbhDto> list = gdbhService.SelectGdbhList(gdbhDto);
         return getDataTable(list);
     }
-
+    @GetMapping("/GetGdbhFlightTb")
+    public TableDataInfo GetGdbhFlightTb() {
+        List<Map<String,String>> list = gdbhService.GetGdbhFlightTb();
+        return getDataTable(list);
+    }
 }

onemap-modules/onemap-apply/src/main/java/com/onemap/apply/mapper/gdbh/GdbhMapper.java

@@ -14,4 +14,6 @@ public interface GdbhMapper extends BaseMapper<GdbhDto> {
 
     Map selectGdbhXzfw(@Param("id") String id);
 
+    List<Map<String, String>> getGdbhFlightTb();
+
 }

onemap-modules/onemap-apply/src/main/java/com/onemap/apply/service/gdbh/IGdbhService.java

@@ -4,6 +4,7 @@ import com.onemap.apply.domain.gdbh.GdbhDto;
 import com.onemap.common.core.web.domain.RequestResult;
 
 import java.util.List;
+import java.util.Map;
 
 public interface IGdbhService {
     RequestResult GetMxList(String param);
@@ -24,4 +25,5 @@ public interface IGdbhService {
 
     List<GdbhDto> SelectGdbhList(GdbhDto gdbhDto);
 
+    List<Map<String,String>> GetGdbhFlightTb();
 }

onemap-modules/onemap-apply/src/main/java/com/onemap/apply/service/gdbh/impl/GdbhServiceImpl.java

@@ -12,10 +12,7 @@ import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
 import javax.annotation.Resource;
-import java.util.ArrayList;
-import java.util.Date;
-import java.util.List;
-import java.util.Map;
+import java.util.*;
 
 @Service
 public class GdbhServiceImpl implements IGdbhService {
@@ -158,6 +155,11 @@ public class GdbhServiceImpl implements IGdbhService {
         return gdbhMapper.selectGdbhList(gdbhDto);
     }
 
+    @Override
+    public List<Map<String,String>> GetGdbhFlightTb() {
+        return gdbhMapper.getGdbhFlightTb();
+    }
+
     @Override
     public RequestResult DeleteGdbh(String bsm) {
         try {

onemap-modules/onemap-apply/src/main/resources/mapper/postgresql/gdbh/GdbhMapper.xml

@@ -32,4 +32,14 @@
         WHERE id = #{id}
     </select>
 
+    <select id="getGdbhFlightTb" resultType="map">
+        SELECT DISTINCT
+            gdbhm.ID,
+            PUBLIC.st_asewkt ( gdbhm.geom )
+        FROM
+            base.t_gdbh_flight AS flight,
+            vector."TB_GDBHMB" AS gdbhm
+        WHERE
+            PUBLIC.st_intersects ( flight.geom, gdbhm.geom );
+    </select>
 </mapper>