From 14ed26ae00d72c2183bcc7081c2b77d112cd59d4 Mon Sep 17 00:00:00 2001 From: weidong Date: Fri, 17 May 2024 10:33:17 +0800 Subject: [PATCH] =?UTF-8?q?1=E3=80=81=E9=A6=96=E9=A1=B5=E5=A2=9E=E5=8A=A0?= =?UTF-8?q?=E7=82=B9=E5=87=BB=E7=BB=9F=E8=AE=A1=E6=98=BE=E7=A4=BA=E5=88=97?= =?UTF-8?q?=E8=A1=A8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../controller/GnssStatusController.java | 1 - .../beidou/controller/IndexController.java | 53 ++++++++++ .../templates/page/device_overview.html | 30 ++++-- .../page/table/device_status_overview.html | 78 +++++++++++++++ .../page/table/gnss_status_list.html | 96 +++++++++++++++++++ 5 files changed, 249 insertions(+), 9 deletions(-) create mode 100644 sec-beidou/src/main/resources/templates/page/table/device_status_overview.html create mode 100644 sec-beidou/src/main/resources/templates/page/table/gnss_status_list.html 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
- 掉线数 0
-
长期无解 0
- 装机量 2020 + 0
+
0
+ 2020
@@ -94,9 +94,9 @@ 20
- 严重 5
- 一般 20 -
无GGA 0
+ 5
+ 20 +
0
@@ -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 @@ + + + + + 设备状态 + + + + + + + + + +
+
+
+ + + + + + + + \ No newline at end of file diff --git a/sec-beidou/src/main/resources/templates/page/table/gnss_status_list.html b/sec-beidou/src/main/resources/templates/page/table/gnss_status_list.html new file mode 100644 index 00000000..fb078efd --- /dev/null +++ b/sec-beidou/src/main/resources/templates/page/table/gnss_status_list.html @@ -0,0 +1,96 @@ + + + + + 设备状态 + + + + + + + + + +
+
+
+ + + + + + + + + + + + + \ No newline at end of file