wangliwen
/
share-platform
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Merge branch 'master' into docker_package

This commit is contained in:
wangliwen 2022-08-11 14:56:28 +08:00
parent a27757f18c f6509b5e19
commit 32b7d27772
1 changed files with 15 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

29
renren-admin/src/main/java/io/renren/modules/monitor/controller/Controller.java
View File

@ -600,20 +600,21 @@ public class Controller {
queryMap.replace("pageNum", (pageNum - 1) * pageSize);
queryMap.replace("pageSize", pageSize);
}
if (StringUtils.isNotBlank(queryMap.get("gpsY").toString())) {
String gpsY = queryMap.get("gpsY").toString();
String gpsX = queryMap.get("gpsX").toString();
if (gpsY.length() > 15) {
gpsY = gpsY.substring(0, gpsY.length() - 1);
}
if (gpsX.length() > 15) {
gpsX = gpsX.substring(0, gpsX.length() - 1);
}
double[] gps84 = CGS2000ToWGS84(Double.parseDouble(gpsY), Double.parseDouble(gpsX));
queryMap.replace("gpsY", String.valueOf(gps84[0]));
queryMap.replace("gpsX", String.valueOf(gps84[1]));
}
//cgcs2000转为wgs84坐标
//if (StringUtils.isNotBlank(queryMap.get("gpsY").toString())) {
// String gpsY = queryMap.get("gpsY").toString();
// String gpsX = queryMap.get("gpsX").toString();
// if (gpsY.length() > 15) {
// gpsY = gpsY.substring(0, gpsY.length() - 1);
// }
// if (gpsX.length() > 15) {
// gpsX = gpsX.substring(0, gpsX.length() - 1);
// }
// double[] gps84 = CGS2000ToWGS84(Double.parseDouble(gpsY), Double.parseDouble(gpsX));
// queryMap.replace("gpsY", String.valueOf(gps84[0]));
// queryMap.replace("gpsX", String.valueOf(gps84[1]));
//
//}
List<String> list1 = null;
if (null != labelCodes && labelCodes.length > 0) {
list1 = Arrays.asList(labelCodes);