diff --git a/sec-beidou/src/main/java/com/imdroid/beidou/controller/GnssSingleDataController.java b/sec-beidou/src/main/java/com/imdroid/beidou/controller/GnssSingleDataController.java index 2ddaa671..a6624d6f 100644 --- a/sec-beidou/src/main/java/com/imdroid/beidou/controller/GnssSingleDataController.java +++ b/sec-beidou/src/main/java/com/imdroid/beidou/controller/GnssSingleDataController.java @@ -43,15 +43,14 @@ public class GnssSingleDataController extends BasicController implements CommonE JSONObject search = null; if (searchParams != null) { search = (JSONObject) JSONObject.parse(searchParams); - System.out.println(search); - String deviceId = search.getString("deviceid"); + + String deviceId = search.getString("sl_deviceid"); // sql where like deviceid Integer freqency = search.getInteger("freqency"); String begin = search.getString("dgt_.createtime"); String end = search.getString("dlt_.createtime"); if(deviceId != null && !deviceId.isEmpty() && freqency!=0){ Page pageable = new Page<>(page == null ? 1 : page, limit == null ? 10 : limit); - // 缺省按1小时采样,如果时间跨度较大,则按最多300条记录的采样率采样 int sample = 6; diff --git a/sec-beidou/src/main/resources/static/api/init_super_admin.json b/sec-beidou/src/main/resources/static/api/init_super_admin.json index 9835dffc..d9252f57 100644 --- a/sec-beidou/src/main/resources/static/api/init_super_admin.json +++ b/sec-beidou/src/main/resources/static/api/init_super_admin.json @@ -54,7 +54,7 @@ "target": "_self" }, { - "title": "Log", + "title": "日志", "href": "page/gnss_single_data", "icon": "fa fa-clipboard", "target": "_self" diff --git a/sec-beidou/src/main/resources/templates/page/gnss_single_data.html b/sec-beidou/src/main/resources/templates/page/gnss_single_data.html index 3def2e9f..6b93c58e 100644 --- a/sec-beidou/src/main/resources/templates/page/gnss_single_data.html +++ b/sec-beidou/src/main/resources/templates/page/gnss_single_data.html @@ -20,7 +20,7 @@
- + @@ -245,5 +245,50 @@ }); + + + + + + + \ No newline at end of file