2025.12.18

feiyu02

昨天 e58a05b78d09bcd4c1a12e8610c5adfc316494e8

 src/main/kotlin/com/flightfeather/uav/biz/report/MissionGridFusion.kt

@@ -149,16 +149,32 @@
                                    town = if (address.address.contains(address.streetNumber)) {
                                        address.address
                                    } else {
                                        address.address + "（" + address.street + address.streetNumber + "）"
//                                        address.address + "（" + address.street + address.streetNumber + "）"
                                        address.address
                                    }
                                }
                                val polygon = listOf(
                                var polygon = listOf(
                                    gf.cell.point1Lon.toDouble() to gf.cell.point1Lat.toDouble(),
                                    gf.cell.point2Lon.toDouble() to gf.cell.point2Lat.toDouble(),
                                    gf.cell.point3Lon.toDouble() to gf.cell.point3Lat.toDouble(),
                                    gf.cell.point4Lon.toDouble() to gf.cell.point4Lat.toDouble(),
                                )
                                bounds = MapUtil.calFourBoundaries(polygon)
                                // 将网格搜索范围扩大一圈网格(针对北纬东经的情况下)
                                bounds?.let { bs->
                                    val offsetLon = bs[1] - bs[0]
                                    val offsetLat = bs[3] - bs[2]
                                    polygon = listOf(
                                        // 网格西北角
                                        bs[0] - offsetLon to bs[3] + offsetLat,
                                        // 网格东北角
                                        bs[1] + offsetLon to bs[3] + offsetLat,
                                        // 网格东南角
                                        bs[1] + offsetLon to bs[2] - offsetLat,
                                        // 网格西南角
                                        bs[0] - offsetLon to bs[2] - offsetLat,
                                    )
                                }
                                highRiskScenes =
                                    sceneInfoRep.findByPolygon(polygon, listOf(SceneType.TYPE19, SceneType.TYPE20, SceneType.TYPE21))
                            }
@@ -189,16 +205,32 @@
                                    town = if (address.address.contains(address.streetNumber)) {
                                        address.address
                                    } else {
                                        address.address + address.street + address.streetNumber
//                                        address.address + "（" + address.street + address.streetNumber + "）"
                                        address.address
                                    }
                                }
                                val polygon = listOf(
                                var polygon = listOf(
                                    gf.cell.point1Lon.toDouble() to gf.cell.point1Lat.toDouble(),
                                    gf.cell.point2Lon.toDouble() to gf.cell.point2Lat.toDouble(),
                                    gf.cell.point3Lon.toDouble() to gf.cell.point3Lat.toDouble(),
                                    gf.cell.point4Lon.toDouble() to gf.cell.point4Lat.toDouble(),
                                )
                                bounds = MapUtil.calFourBoundaries(polygon)
                                // 将网格搜索范围扩大一圈网格(针对北纬东经的情况下)
                                bounds?.let { bs->
                                    val offsetLon = bs[1] - bs[0]
                                    val offsetLat = bs[3] - bs[2]
                                    polygon = listOf(
                                        // 网格西北角
                                        bs[0] - offsetLon to bs[3] + offsetLat,
                                        // 网格东北角
                                        bs[1] + offsetLon to bs[3] + offsetLat,
                                        // 网格东南角
                                        bs[1] + offsetLon to bs[2] - offsetLat,
                                        // 网格西南角
                                        bs[0] - offsetLon to bs[2] - offsetLat,
                                    )
                                }
                                highRiskScenes =
                                    sceneInfoRep.findByPolygon(polygon, listOf(SceneType.TYPE19, SceneType.TYPE20, SceneType.TYPE21))
                            })