This commit is contained in:
dinggang 2022-08-11 14:55:20 +08:00
parent 4aee184562
commit f6509b5e19
1 changed files with 15 additions and 14 deletions

View File

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