Imdroid/security-monitor
2
0
Fork 0
Code Issues Pull Requests 1 Actions Packages Projects Releases Wiki Activity

feat：显示未推送的设备

Browse Source
This commit is contained in:
fengyarnom 2025-06-10 16:48:40 +08:00
parent 8ec6d394b3
commit ba8b2e9512
2 changed files with 30 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

29
sec-beidou/src/main/java/com/imdroid/beidou/controller/IndexController.java
View File

@ -1,6 +1,7 @@
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.github.yulichang.query.MPJQueryWrapper;
@ -45,6 +46,26 @@ public class IndexController extends BasicController{
int noGGA = 0;
int noFix = 0;
//未推送设备数（同时满足：非SAAS服务商、使用状态正常、fwd_group_id和fwd_group_id2都为"不推送"的设备）
Long deviceNoFwdNum;
QueryWrapper<GnssDevice> noFwdQueryWrapper = new QueryWrapper<>();
if (tenantId != Tenant.SAAS_PROVIDER_ID) {
// 非SAAS服务商查询当前租户
noFwdQueryWrapper.eq("tenantid", tenantId);
} else {
// SAAS服务商查询所有非SAAS的租户
noFwdQueryWrapper.ne("tenantid", Tenant.SAAS_PROVIDER_ID);
}
// 使用状态正常
noFwdQueryWrapper.eq("opmode", GnssDevice.OP_MODE_USE);
// 设备类型为测站（非基站）
noFwdQueryWrapper.eq("devicetype", GnssDevice.TYPE_ROVER);
// fwd_group_id为"不推送"
noFwdQueryWrapper.eq("fwd_group_id", GnssGroupFwd.FWD_TYPE_NONE);
// fwd_group_id2为"不推送"或为null
noFwdQueryWrapper.and(wrapper -> wrapper.eq("fwd_group_id2", GnssGroupFwd.FWD_TYPE_NONE).or().isNull("fwd_group_id2"));
deviceNoFwdNum = gnssDeviceMapper.selectCount(noFwdQueryWrapper);
List<GnssStatusJoin> deviceList;
if(tenantId == Tenant.SAAS_PROVIDER_ID){
deviceList = statusMapper.queryDeployed();
@ -94,6 +115,7 @@ public class IndexController extends BasicController{
m.addAttribute("warningTotalNum", warning1Num+warning2Num);
m.addAttribute("noGGA", noGGA);
m.addAttribute("noFix", noFix);
m.addAttribute("deviceNoFwdNum", deviceNoFwdNum);
m.addAttribute("deviceList", deviceList);
return "/page/device_overview";
@ -149,6 +171,13 @@ public class IndexController extends BasicController{
else if(query.equals("nogga")){
queryWrapper.isNull("latitude");
}
else if(query.equals("no_fwd")){
// 查询同时满足：使用状态正常、设备类型为测站、fwd_group_id和fwd_group_id2都为"不推送"的设备
queryWrapper.eq("d.opmode", GnssDevice.OP_MODE_USE)
.eq("d.devicetype", GnssDevice.TYPE_ROVER)
.eq("d.fwd_group_id", GnssGroupFwd.FWD_TYPE_NONE)
.and(wrapper -> wrapper.eq("d.fwd_group_id2", GnssGroupFwd.FWD_TYPE_NONE).or().isNull("d.fwd_group_id2"));
}
session.setAttribute("query",query);
}

1
sec-beidou/src/main/resources/templates/page/device_overview.html
View File

@ -130,6 +130,7 @@
</div>
<div class="layui-col-xs3 layui-col-md4">
<a href="#" onclick="queryDevices('offline')" style="color: #bd3004" th:text="'掉线数 '+${deviceOfflineNum}">0</a><br>
<div th:if="${deviceNoFwdNum>0}"><a href="#" onclick="queryDevices('no_fwd')" style="color: #bd3004" th:text="'未推送数 '+${deviceNoFwdNum}">0</a><br></div>
<div th:if="${noFix>0}"><a href="#" onclick="queryDevices('nofixed')" style="color: #bd3004" th:text="'长期无效解 '+${noFix}">0</a><br></div>
<a style="color: #000000" th:text="'装机量 '+${deviceDeployedNum}">2020</a>
</div>