From c17e9978745cfe6c983f3aff75c9182fffef32fd Mon Sep 17 00:00:00 2001
From: feiyu02 <risaku@163.com>
Date: 星期一, 09 六月 2025 17:29:23 +0800
Subject: [PATCH] 1. 修复部分数据统计接口bug
---
src/test/kotlin/cn/flightfeather/supervision/business/location/LocationRoadNearbyTest.kt | 174 +++++++++++++++++++++++++++++++++++++++++++++++++++++++--
1 files changed, 166 insertions(+), 8 deletions(-)
diff --git a/src/test/kotlin/cn/flightfeather/supervision/business/location/LocationRoadNearbyTest.kt b/src/test/kotlin/cn/flightfeather/supervision/business/location/LocationRoadNearbyTest.kt
index d519504..3218214 100644
--- a/src/test/kotlin/cn/flightfeather/supervision/business/location/LocationRoadNearbyTest.kt
+++ b/src/test/kotlin/cn/flightfeather/supervision/business/location/LocationRoadNearbyTest.kt
@@ -2,16 +2,15 @@
import cn.flightfeather.supervision.domain.ds1.mapper.ScenseMapper
import org.junit.Test
-import org.junit.jupiter.api.Assertions.*
-import org.junit.jupiter.api.extension.ExtendWith
import org.junit.runner.RunWith
import org.springframework.beans.factory.annotation.Autowired
import org.springframework.boot.test.context.SpringBootTest
import org.springframework.test.context.junit.jupiter.SpringExtension
import org.springframework.test.context.junit4.SpringRunner
+import kotlin.math.log
@RunWith(SpringRunner::class)
-@ExtendWith(SpringExtension::class)
+//@ExtendWith(SpringExtension::class)
@SpringBootTest
class LocationRoadNearbyTest {
@@ -45,10 +44,12 @@
// LocationRoadNearby.BasePlace("鍚曢潚璺�-鏈卞悤鍏矾-鏈卞钩鍏矾", Pair(121.136318,30.833325), Pair(121.148624,30.836094)),
// LocationRoadNearby.BasePlace("娉栨咕鏀矾-鍚曢潚璺�-鏈卞钩鍏矾", Pair(121.155048,30.835229), Pair(121.148659,30.829861)),
-// LocationRoadNearby.BasePlace("寰愭眹涓婂笀澶�", Pair(121.419384,31.161433), Pair(121.419384,31.161433)),
+// LocationRoadNearby.BasePlace("寰愭眹涓婂笀澶�", Pair(121.419384, 31.161433), Pair(121.419384, 31.161433)),
+// LocationRoadNearby.BasePlace("甯傛帶鐐�-寰愬姹�", Pair(121.44187, 31.19793), Pair(121.44187, 31.19793)),
+// LocationRoadNearby.BasePlace("甯傛帶鐐�-鍗庢尘", Pair(121.461985, 31.124359), Pair(121.461985, 31.124359)),
// LocationRoadNearby.BasePlace("闈欏畨鐩戞祴绔欏浗鎺х偣", Pair(121.429439, 31.223632), Pair(121.429439, 31.223632)),
// LocationRoadNearby.BasePlace("閲戝北澶ч亾2000鍙�", Pair(121.3404, 30.744262), Pair(121.3404, 30.744262)),
- LocationRoadNearby.BasePlace("浠欓湠绔�", Pair(121.394775, 31.203982), Pair(121.394775, 31.203982)),
+// LocationRoadNearby.BasePlace("浠欓湠绔�", Pair(121.394775, 31.203982), Pair(121.394775, 31.203982)),
// LocationRoadNearby.BasePlace("绋嬫ˉ绔�", Pair(121.362928, 31.192925), Pair(121.362928, 31.192925)),
// LocationRoadNearby.BasePlace("闀块槼绔�", Pair(121.424603, 31.223644), Pair(121.424603, 31.223644)),
@@ -74,14 +75,171 @@
// LocationRoadNearby.BasePlace("鐝犳腐琛�", Pair(121.337652, 30.847802), Pair(121.345829, 30.846835)),
// LocationRoadNearby.BasePlace("鑽ｄ笢璺�", Pair(121.249271, 30.832921), Pair(121.249176, 30.835928)),
// LocationRoadNearby.BasePlace("涔濅赴璺�", Pair(121.254114, 30.903438), Pair(121.254715, 30.893363)),
+
+// 灏忓井绔�
+ LocationRoadNearby.BasePlace("姘稿拰浜屾潙", Pair(121.43165,31.29083), Pair(121.43165,31.29083)),
+ LocationRoadNearby.BasePlace("鑺锋睙涓矾529鍙�", Pair(121.468446,31.258494), Pair(121.468446,31.258494)),
+ LocationRoadNearby.BasePlace("搴峰畞璺�18鍙�", Pair(121.43447,31.306374), Pair(121.43447,31.306374)),
+ LocationRoadNearby.BasePlace("鍗忎俊鏄熷厜骞垮満", Pair(121.457125,31.297407), Pair(121.457125,31.297407)),
+ LocationRoadNearby.BasePlace("鍏卞悍鍓嶈繘鍏瘬", Pair(121.441018,31.319358), Pair(121.441018,31.319358)),
+ LocationRoadNearby.BasePlace("闈欏畨鐩戞祴绔�", Pair(121.429872,31.224094), Pair(121.429872,31.224094)),
+ LocationRoadNearby.BasePlace("鍏卞拰鏂拌矾鍦轰腑璺�", Pair(121.449074,31.306086), Pair(121.449074,31.306086)),
+ LocationRoadNearby.BasePlace("宀崡璺満涓矾", Pair(121.455317,31.304615), Pair(121.455317,31.304615)),
+ LocationRoadNearby.BasePlace("楂樺钩璺睙鍦鸿タ璺�", Pair(121.427832,31.296076), Pair(121.427832,31.296076)),
+ LocationRoadNearby.BasePlace("骞夸腑瑗胯矾鍏卞拰鏂拌矾", Pair(121.451879,31.278988), Pair(121.451879,31.278988)),
+ LocationRoadNearby.BasePlace("闂稿寳鍏洯", Pair(121.46179,31.271121), Pair(121.46179,31.271121)),
+ LocationRoadNearby.BasePlace("鏌宠惀璺叡鍜屾柊璺�", Pair(121.459427,31.265294), Pair(121.459427,31.265294)),
+ LocationRoadNearby.BasePlace("涓北鍖楄矾鍏卞拰鏂拌矾", Pair(121.46149,31.260937), Pair(121.46149,31.260937)),
+ LocationRoadNearby.BasePlace("涓滃疂鍏磋矾涓叴璺�2024骞�7鏈�24鏃ョЩ浣嶈嚦瀹濋�氳矾539鍙�", Pair(121.475521,31.261383), Pair(121.475521,31.261383)),
+ LocationRoadNearby.BasePlace("澶ф偊鍩�", Pair(121.472183,31.243488), Pair(121.472183,31.243488)),
+ LocationRoadNearby.BasePlace("闄曡タ鍖楄矾娴烽槻璺�", Pair(121.446472,31.238458), Pair(121.446472,31.238458)),
+ LocationRoadNearby.BasePlace("甯稿痉璺柊闂歌矾", Pair(121.447048,31.229643), Pair(121.447048,31.229643)),
+ LocationRoadNearby.BasePlace("寤跺畨涓矾瀵屾皯璺�", Pair(121.449711,31.221563), Pair(121.449711,31.221563)),
+ LocationRoadNearby.BasePlace("寤跺畨瑗胯矾闀囧畞璺�", Pair(121.439025,31.218146), Pair(121.439025,31.218146)),
+ LocationRoadNearby.BasePlace("骞夸腑瑗胯矾涓囪崳璺�", Pair(121.442032,31.278071), Pair(121.442032,31.278071)),
+ LocationRoadNearby.BasePlace("骞夸腑瑗胯矾杩愬煄璺�2024骞�9鏈�3鏃ョЩ浣嶈嚦涓叴绀惧尯280-06鍦板潡", Pair(121.473931,31.254645), Pair(121.473931,31.254645)),
+ LocationRoadNearby.BasePlace("鍢夊埄鏄庣彔鍩�", Pair(121.434364,31.304047), Pair(121.434364,31.304047)),
+ LocationRoadNearby.BasePlace("姹捐タ璺槼娉夎矾", Pair(121.464122,31.31351), Pair(121.464122,31.31351)),
+ LocationRoadNearby.BasePlace("娌冲崡鍖楄矾澶╂郊璺�", Pair(121.482241,31.243679), Pair(121.482241,31.243679)),
+ LocationRoadNearby.BasePlace("姹舵按璺竾鑽ｈ矾", Pair(121.441558,31.291293), Pair(121.441558,31.291293)),
+ LocationRoadNearby.BasePlace("鐭抽棬涓�璺�348鍙�", Pair(121.462105,31.229639), Pair(121.462105,31.229639)),
+ LocationRoadNearby.BasePlace("杩愬煄璺疁宸濊矾", Pair(121.439137,31.271005), Pair(121.439137,31.271005)),
)
listOf(
500.0,
-// 1000.0,
- 2000.0,
- 3000.0
+ 1000.0,
+// 2000.0,
+// 3000.0,
+// 5000.0
).forEach {
locationRoadNearby.searchList(bList, it)
}
}
+
+ @Test
+ fun foo2() {
+ val bList = listOf(
+ LocationRoadNearby.BasePlace("1", Pair(121.334271, 31.238706), Pair(121.334271, 31.238706)),
+ LocationRoadNearby.BasePlace("2", Pair(121.343935, 31.239303), Pair(121.343935, 31.239303)),
+ LocationRoadNearby.BasePlace("3", Pair(121.3536, 31.239898), Pair(121.3536, 31.239898)),
+ LocationRoadNearby.BasePlace("4", Pair(121.363263, 31.240491), Pair(121.363263, 31.240491)),
+ LocationRoadNearby.BasePlace("5", Pair(121.372924, 31.241082), Pair(121.372924, 31.241082)),
+ LocationRoadNearby.BasePlace("6", Pair(121.382581, 31.241668), Pair(121.382581, 31.241668)),
+ LocationRoadNearby.BasePlace("7", Pair(121.392235, 31.242251), Pair(121.392235, 31.242251)),
+ LocationRoadNearby.BasePlace("8", Pair(121.401886, 31.24283), Pair(121.401886, 31.24283)),
+ LocationRoadNearby.BasePlace("9", Pair(121.411531, 31.243404), Pair(121.411531, 31.243404)),
+ LocationRoadNearby.BasePlace("10", Pair(121.421172, 31.243972), Pair(121.421172, 31.243972)),
+ LocationRoadNearby.BasePlace("11", Pair(121.430808, 31.244536), Pair(121.430808, 31.244536)),
+ LocationRoadNearby.BasePlace("12", Pair(121.440441, 31.245096), Pair(121.440441, 31.245096)),
+ LocationRoadNearby.BasePlace("13", Pair(121.334944, 31.230417), Pair(121.334944, 31.230417)),
+ LocationRoadNearby.BasePlace("14", Pair(121.344609, 31.231014), Pair(121.344609, 31.231014)),
+ LocationRoadNearby.BasePlace("15", Pair(121.354273, 31.231609), Pair(121.354273, 31.231609)),
+ LocationRoadNearby.BasePlace("16", Pair(121.363934, 31.232202), Pair(121.363934, 31.232202)),
+ LocationRoadNearby.BasePlace("17", Pair(121.373595, 31.232792), Pair(121.373595, 31.232792)),
+ LocationRoadNearby.BasePlace("18", Pair(121.383251, 31.233378), Pair(121.383251, 31.233378)),
+ LocationRoadNearby.BasePlace("19", Pair(121.392904, 31.233961), Pair(121.392904, 31.233961)),
+ LocationRoadNearby.BasePlace("20", Pair(121.402553, 31.234539), Pair(121.402553, 31.234539)),
+ LocationRoadNearby.BasePlace("21", Pair(121.412197, 31.235112), Pair(121.412197, 31.235112)),
+ LocationRoadNearby.BasePlace("22", Pair(121.421837, 31.235681), Pair(121.421837, 31.235681)),
+ LocationRoadNearby.BasePlace("23", Pair(121.431472, 31.236245), Pair(121.431472, 31.236245)),
+ LocationRoadNearby.BasePlace("24", Pair(121.441103, 31.236803), Pair(121.441103, 31.236803)),
+ LocationRoadNearby.BasePlace("25", Pair(121.335618, 31.222129), Pair(121.335618, 31.222129)),
+ LocationRoadNearby.BasePlace("26", Pair(121.345282, 31.222726), Pair(121.345282, 31.222726)),
+ LocationRoadNearby.BasePlace("27", Pair(121.354944, 31.223321), Pair(121.354944, 31.223321)),
+ LocationRoadNearby.BasePlace("28", Pair(121.364606, 31.223913), Pair(121.364606, 31.223913)),
+ LocationRoadNearby.BasePlace("29", Pair(121.374265, 31.224503), Pair(121.374265, 31.224503)),
+ LocationRoadNearby.BasePlace("30", Pair(121.38392, 31.225089), Pair(121.38392, 31.225089)),
+ LocationRoadNearby.BasePlace("31", Pair(121.393572, 31.225671), Pair(121.393572, 31.225671)),
+ LocationRoadNearby.BasePlace("32", Pair(121.40322, 31.226248), Pair(121.40322, 31.226248)),
+ LocationRoadNearby.BasePlace("33", Pair(121.412863, 31.226821), Pair(121.412863, 31.226821)),
+ LocationRoadNearby.BasePlace("34", Pair(121.422502, 31.227389), Pair(121.422502, 31.227389)),
+ LocationRoadNearby.BasePlace("35", Pair(121.432135, 31.227952), Pair(121.432135, 31.227952)),
+ LocationRoadNearby.BasePlace("36", Pair(121.441765, 31.228511), Pair(121.441765, 31.228511)),
+ LocationRoadNearby.BasePlace("37", Pair(121.336292, 31.213841), Pair(121.336292, 31.213841)),
+ LocationRoadNearby.BasePlace("38", Pair(121.345955, 31.214437), Pair(121.345955, 31.214437)),
+ LocationRoadNearby.BasePlace("39", Pair(121.355617, 31.215032), Pair(121.355617, 31.215032)),
+ LocationRoadNearby.BasePlace("40", Pair(121.365276, 31.215624), Pair(121.365276, 31.215624)),
+ LocationRoadNearby.BasePlace("41", Pair(121.374934, 31.216213), Pair(121.374934, 31.216213)),
+ LocationRoadNearby.BasePlace("42", Pair(121.384589, 31.216799), Pair(121.384589, 31.216799)),
+ LocationRoadNearby.BasePlace("43", Pair(121.394239, 31.21738), Pair(121.394239, 31.21738)),
+ LocationRoadNearby.BasePlace("44", Pair(121.403886, 31.217958), Pair(121.403886, 31.217958)),
+ LocationRoadNearby.BasePlace("45", Pair(121.413528, 31.21853), Pair(121.413528, 31.21853)),
+ LocationRoadNearby.BasePlace("46", Pair(121.423165, 31.219097), Pair(121.423165, 31.219097)),
+ LocationRoadNearby.BasePlace("47", Pair(121.432799, 31.21966), Pair(121.432799, 31.21966)),
+ LocationRoadNearby.BasePlace("48", Pair(121.442427, 31.220218), Pair(121.442427, 31.220218)),
+ LocationRoadNearby.BasePlace("49", Pair(121.336966, 31.205552), Pair(121.336966, 31.205552)),
+ LocationRoadNearby.BasePlace("50", Pair(121.346627, 31.206149), Pair(121.346627, 31.206149)),
+ LocationRoadNearby.BasePlace("51", Pair(121.356289, 31.206743), Pair(121.356289, 31.206743)),
+ LocationRoadNearby.BasePlace("52", Pair(121.365948, 31.207335), Pair(121.365948, 31.207335)),
+ LocationRoadNearby.BasePlace("53", Pair(121.375604, 31.207923), Pair(121.375604, 31.207923)),
+ LocationRoadNearby.BasePlace("54", Pair(121.385257, 31.208509), Pair(121.385257, 31.208509)),
+ LocationRoadNearby.BasePlace("55", Pair(121.394907, 31.20909), Pair(121.394907, 31.20909)),
+ LocationRoadNearby.BasePlace("56", Pair(121.404553, 31.209667), Pair(121.404553, 31.209667)),
+ LocationRoadNearby.BasePlace("57", Pair(121.414193, 31.210238), Pair(121.414193, 31.210238)),
+ LocationRoadNearby.BasePlace("58", Pair(121.42383, 31.210805), Pair(121.42383, 31.210805)),
+ LocationRoadNearby.BasePlace("59", Pair(121.433461, 31.211368), Pair(121.433461, 31.211368)),
+ LocationRoadNearby.BasePlace("60", Pair(121.443088, 31.211925), Pair(121.443088, 31.211925)),
+ LocationRoadNearby.BasePlace("61", Pair(121.337639, 31.197263), Pair(121.337639, 31.197263)),
+ LocationRoadNearby.BasePlace("62", Pair(121.3473, 31.19786), Pair(121.3473, 31.19786)),
+ LocationRoadNearby.BasePlace("63", Pair(121.356959, 31.198453), Pair(121.356959, 31.198453)),
+ LocationRoadNearby.BasePlace("64", Pair(121.366617, 31.199045), Pair(121.366617, 31.199045)),
+ LocationRoadNearby.BasePlace("65", Pair(121.376274, 31.199634), Pair(121.376274, 31.199634)),
+ LocationRoadNearby.BasePlace("66", Pair(121.385925, 31.200218), Pair(121.385925, 31.200218)),
+ LocationRoadNearby.BasePlace("67", Pair(121.395574, 31.200799), Pair(121.395574, 31.200799)),
+ LocationRoadNearby.BasePlace("68", Pair(121.405218, 31.201376), Pair(121.405218, 31.201376)),
+ LocationRoadNearby.BasePlace("69", Pair(121.414858, 31.201947), Pair(121.414858, 31.201947)),
+ LocationRoadNearby.BasePlace("70", Pair(121.424494, 31.202514), Pair(121.424494, 31.202514)),
+ LocationRoadNearby.BasePlace("71", Pair(121.434123, 31.203075), Pair(121.434123, 31.203075)),
+ LocationRoadNearby.BasePlace("72", Pair(121.44375, 31.203632), Pair(121.44375, 31.203632)),
+ LocationRoadNearby.BasePlace("73", Pair(121.338312, 31.188975), Pair(121.338312, 31.188975)),
+ LocationRoadNearby.BasePlace("74", Pair(121.347972, 31.189571), Pair(121.347972, 31.189571)),
+ LocationRoadNearby.BasePlace("75", Pair(121.357631, 31.190164), Pair(121.357631, 31.190164)),
+ LocationRoadNearby.BasePlace("76", Pair(121.367288, 31.190755), Pair(121.367288, 31.190755)),
+ LocationRoadNearby.BasePlace("77", Pair(121.376943, 31.191343), Pair(121.376943, 31.191343)),
+ LocationRoadNearby.BasePlace("78", Pair(121.386593, 31.191928), Pair(121.386593, 31.191928)),
+ LocationRoadNearby.BasePlace("79", Pair(121.396241, 31.192508), Pair(121.396241, 31.192508)),
+ LocationRoadNearby.BasePlace("80", Pair(121.405884, 31.193084), Pair(121.405884, 31.193084)),
+ LocationRoadNearby.BasePlace("81", Pair(121.415522, 31.193656), Pair(121.415522, 31.193656)),
+ LocationRoadNearby.BasePlace("82", Pair(121.425156, 31.194221), Pair(121.425156, 31.194221)),
+ LocationRoadNearby.BasePlace("83", Pair(121.434785, 31.194782), Pair(121.434785, 31.194782)),
+ LocationRoadNearby.BasePlace("84", Pair(121.444411, 31.195339), Pair(121.444411, 31.195339)),
+ LocationRoadNearby.BasePlace("85", Pair(121.338984, 31.180686), Pair(121.338984, 31.180686)),
+ LocationRoadNearby.BasePlace("86", Pair(121.348643, 31.181281), Pair(121.348643, 31.181281)),
+ LocationRoadNearby.BasePlace("87", Pair(121.358302, 31.181875), Pair(121.358302, 31.181875)),
+ LocationRoadNearby.BasePlace("88", Pair(121.367957, 31.182466), Pair(121.367957, 31.182466)),
+ LocationRoadNearby.BasePlace("89", Pair(121.377611, 31.183053), Pair(121.377611, 31.183053)),
+ LocationRoadNearby.BasePlace("90", Pair(121.387261, 31.183638), Pair(121.387261, 31.183638)),
+ LocationRoadNearby.BasePlace("91", Pair(121.396907, 31.184217), Pair(121.396907, 31.184217)),
+ LocationRoadNearby.BasePlace("92", Pair(121.406549, 31.184793), Pair(121.406549, 31.184793)),
+ LocationRoadNearby.BasePlace("93", Pair(121.416187, 31.185363), Pair(121.416187, 31.185363)),
+ LocationRoadNearby.BasePlace("94", Pair(121.42582, 31.18593), Pair(121.42582, 31.18593)),
+ LocationRoadNearby.BasePlace("95", Pair(121.435448, 31.18649), Pair(121.435448, 31.18649)),
+ LocationRoadNearby.BasePlace("96", Pair(121.445071, 31.187046), Pair(121.445071, 31.187046)),
+ LocationRoadNearby.BasePlace("97", Pair(121.339657, 31.172397), Pair(121.339657, 31.172397)),
+ LocationRoadNearby.BasePlace("98", Pair(121.349315, 31.172992), Pair(121.349315, 31.172992)),
+ LocationRoadNearby.BasePlace("99", Pair(121.358972, 31.173586), Pair(121.358972, 31.173586)),
+ LocationRoadNearby.BasePlace("100", Pair(121.368627, 31.174176), Pair(121.368627, 31.174176)),
+ LocationRoadNearby.BasePlace("101", Pair(121.378279, 31.174764), Pair(121.378279, 31.174764)),
+ LocationRoadNearby.BasePlace("102", Pair(121.387928, 31.175347), Pair(121.387928, 31.175347)),
+ LocationRoadNearby.BasePlace("103", Pair(121.397574, 31.175926), Pair(121.397574, 31.175926)),
+ LocationRoadNearby.BasePlace("104", Pair(121.407215, 31.176501), Pair(121.407215, 31.176501)),
+ LocationRoadNearby.BasePlace("105", Pair(121.41685, 31.177072), Pair(121.41685, 31.177072)),
+ LocationRoadNearby.BasePlace("106", Pair(121.426483, 31.177637), Pair(121.426483, 31.177637)),
+ LocationRoadNearby.BasePlace("107", Pair(121.436109, 31.178198), Pair(121.436109, 31.178198)),
+ LocationRoadNearby.BasePlace("108", Pair(121.445732, 31.178752), Pair(121.445732, 31.178752)),
+ )
+ val locationRoadNearby = LocationRoadNearby(scenseMapper)
+ locationRoadNearby.searchList(bList, 0.9178855120092253 / 2 * 1000)
+// val d = CoordinateUtil.calculateDistance(121.436109, 31.178198, 121.426483, 31.177637)
+// println(d)
+ }
+
+ @Test
+ fun foo3(){
+ val locationDistance = LocationDistance(scenseMapper)
+ val bList = listOf(
+ BasePlace("閲戝北澶ч亾2000鍙�", Pair(121.3404, 30.744262), Pair(121.3404, 30.744262)),
+ )
+ locationDistance.searchList(bList, "閲戝北鍖�")
+ }
}
\ No newline at end of file
--
Gitblit v1.9.3