Skip to content

M
map-parent
Commit d2ab65f4 by yangyang
Options

弱轨迹统计计算提交(湖南)

parent 9b3c5e1d
Showing with 4 additions and 4 deletions
service/publicapi/src/main/java/com/founder/publicapi/controller/SkInterface/InterfaceAPI.java
...@@ -101,7 +101,7 @@ public class InterfaceAPI { ...@@ -101,7 +101,7 @@ public class InterfaceAPI {
if (org.apache.commons.lang.StringUtils.isNotBlank(endDate)) { if (org.apache.commons.lang.StringUtils.isNotBlank(endDate)) {
sql += "AND KSSJ < '" + timetoGj(endDate) + "' "; sql += "AND KSSJ < '" + timetoGj(endDate) + "' ";
} }
sql += " limit " + begin + "," + rows + " order by KSSJ desc"; sql += " limit " + begin + ",1000" + " order by KSSJ desc";
Map resultMap = EsUtils.newQueryEs(request, sql); Map resultMap = EsUtils.newQueryEs(request, sql);
List<SkTrail> points = new ArrayList<>();// 返回数据与前端一致 List<SkTrail> points = new ArrayList<>();// 返回数据与前端一致
...@@ -307,7 +307,7 @@ public class InterfaceAPI { ...@@ -307,7 +307,7 @@ public class InterfaceAPI {
if (org.apache.commons.lang.StringUtils.isNotBlank(endDate)) { if (org.apache.commons.lang.StringUtils.isNotBlank(endDate)) {
sql += "AND KSSJ < '" + endDate + "' "; sql += "AND KSSJ < '" + endDate + "' ";
} }
sql += " limit " + begin + "," + rows + " order by KSSJ desc"; sql += " limit " + begin + ",1000" + " order by KSSJ desc";
Map resultMap = EsUtils.newQueryEs(request, sql); Map resultMap = EsUtils.newQueryEs(request, sql);
List<SkTrail> points = new ArrayList<>();// 返回数据与前端一致 List<SkTrail> points = new ArrayList<>();// 返回数据与前端一致
if(null != resultMap.get("data")){ if(null != resultMap.get("data")){
...@@ -517,7 +517,7 @@ public class InterfaceAPI { ...@@ -517,7 +517,7 @@ public class InterfaceAPI {
if (org.apache.commons.lang.StringUtils.isNotBlank(endDate)) { if (org.apache.commons.lang.StringUtils.isNotBlank(endDate)) {
sql += " AND KSSJ < '" + endDate + "' "; sql += " AND KSSJ < '" + endDate + "' ";
} }
sql += " limit " + begin + "," + rows + " order by KSSJ desc"; sql += " limit " + begin + ",1000" + " order by KSSJ desc";
Map resultMap = EsUtils.newQueryEs(request, sql); Map resultMap = EsUtils.newQueryEs(request, sql);
List<SkTrail> points = new ArrayList<>();// 返回数据与前端一致 List<SkTrail> points = new ArrayList<>();// 返回数据与前端一致
if(null != resultMap.get("data")){ if(null != resultMap.get("data")){
...@@ -636,7 +636,7 @@ public class InterfaceAPI { ...@@ -636,7 +636,7 @@ public class InterfaceAPI {
if (org.apache.commons.lang.StringUtils.isNotBlank(endDate)) { if (org.apache.commons.lang.StringUtils.isNotBlank(endDate)) {
sql += "AND KSSJ < '" + endDate + "' "; sql += "AND KSSJ < '" + endDate + "' ";
} }
sql += " AND JSSJ IS NOT NULL limit " + begin + "," + rows + " " + sql += " AND JSSJ IS NOT NULL limit " + begin + ",1000" + " " +
"order by KSSJ desc"; "order by KSSJ desc";
Map resultMap = EsUtils.newQueryEs(request, sql); Map resultMap = EsUtils.newQueryEs(request, sql);
List<SkTrail> points = new ArrayList<>();// 返回数据与前端一致 List<SkTrail> points = new ArrayList<>();// 返回数据与前端一致
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment