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 ffda326d..c0500ed1 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,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 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 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); } 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 e509d545..5a783634 100644 --- a/sec-beidou/src/main/resources/templates/page/device_overview.html +++ b/sec-beidou/src/main/resources/templates/page/device_overview.html @@ -130,6 +130,7 @@
0
+
0
0
2020