diff --git a/sec-beidou/src/main/java/com/imdroid/beidou/controller/GnssStatusController.java b/sec-beidou/src/main/java/com/imdroid/beidou/controller/GnssStatusController.java
index 49793be7..3f449b4e 100644
--- a/sec-beidou/src/main/java/com/imdroid/beidou/controller/GnssStatusController.java
+++ b/sec-beidou/src/main/java/com/imdroid/beidou/controller/GnssStatusController.java
@@ -36,7 +36,6 @@ public class GnssStatusController extends BasicController implements CommonExcel
return "/page/gnss_status";
}
-
/**** 推送数据 *****/
@RequestMapping("/gnss/status/list")
@ResponseBody
diff --git a/sec-beidou/src/main/java/com/imdroid/beidou/controller/IndexController.java b/sec-beidou/src/main/java/com/imdroid/beidou/controller/IndexController.java
index 3ecb879e..15c85257 100644
--- a/sec-beidou/src/main/java/com/imdroid/beidou/controller/IndexController.java
+++ b/sec-beidou/src/main/java/com/imdroid/beidou/controller/IndexController.java
@@ -1,11 +1,17 @@
package com.imdroid.beidou.controller;
+import com.alibaba.fastjson.JSONObject;
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.imdroid.beidou.entity.Tenant;
import com.imdroid.secapi.dto.*;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Controller;
import org.springframework.ui.Model;
import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RequestParam;
+import org.springframework.web.bind.annotation.ResponseBody;
import javax.servlet.http.HttpSession;
import java.util.Iterator;
@@ -90,4 +96,51 @@ public class IndexController extends BasicController{
return "/page/device_overview";
}
+ @RequestMapping("/page/gnss_q_status")
+ public String gnssStatusQuery(Model m, HttpSession session,@RequestParam String query) {
+ initModel(m, session);
+ if(query != null){
+ session.setAttribute("query",query);
+ }
+ return "/page/table/gnss_status_list";
+ }
+
+ /**** 推送数据 *****/
+ @RequestMapping("/gnss/q_status/list")
+ @ResponseBody
+ public JSONObject list(HttpSession session, Integer page, Integer limit) {
+ Page pageable = new Page<>(page == null ? 1 : page, limit == null ? 10 : limit);
+ QueryWrapper queryWrapper = new QueryWrapper<>();
+ queryWrapper.ne("tenantid",Tenant.SAAS_PROVIDER_ID);
+ String query = (String) session.getAttribute("query");
+ if(query != null){
+ if(query.equals("offline")){
+ queryWrapper.eq("state",GnssStatus.STATE_OFFLINE);
+ }
+ else if(query.equals("nofixed")){
+ queryWrapper.ge("warningcode",256);
+ queryWrapper.le("warningcode",512);
+ }
+ else if(query.equals("warning1")){
+ queryWrapper.eq("warning",WarningCfg.LEVEL_1);
+ }
+ else if(query.equals("warning2")){
+ queryWrapper.eq("warning",WarningCfg.LEVEL_2);
+ }
+ else if(query.equals("nogga")){
+ queryWrapper.isNull("latitude");
+ }
+ session.setAttribute("query",query);
+ }
+
+ IPage cs = statusMapper.selectPage(pageable, queryWrapper);
+ JSONObject jsonObject = new JSONObject();
+ jsonObject.put("code", 0);
+ jsonObject.put("msg", "");
+ jsonObject.put("count", cs.getTotal());
+ jsonObject.put("data", cs.getRecords());
+ return jsonObject;
+ }
+
+
}
diff --git a/sec-beidou/src/main/resources/templates/page/device_overview.html b/sec-beidou/src/main/resources/templates/page/device_overview.html
index 9783e749..6592a7a7 100644
--- a/sec-beidou/src/main/resources/templates/page/device_overview.html
+++ b/sec-beidou/src/main/resources/templates/page/device_overview.html
@@ -77,9 +77,9 @@
2,020
@@ -94,9 +94,9 @@
20
@@ -315,8 +315,22 @@
map.removeOverlay(redLabels[i]);
}
}
-
-
+
+
+
diff --git a/sec-beidou/src/main/resources/templates/page/table/device_status_overview.html b/sec-beidou/src/main/resources/templates/page/table/device_status_overview.html
new file mode 100644
index 00000000..fba385c5
--- /dev/null
+++ b/sec-beidou/src/main/resources/templates/page/table/device_status_overview.html
@@ -0,0 +1,78 @@
+
+
+