1、修改停用设备显示在首页的bug
This commit is contained in:
parent
b20f88bab6
commit
f1b4a56f41
@ -35,7 +35,7 @@ public class IndexController extends BasicController{
|
|||||||
public String deviceOverview(Model m, HttpSession session) {
|
public String deviceOverview(Model m, HttpSession session) {
|
||||||
initModel(m, session);
|
initModel(m, session);
|
||||||
Long deviceDeployedNum;
|
Long deviceDeployedNum;
|
||||||
int deviceOnlineNum=0;
|
int deviceOfflineNum=0;
|
||||||
int warning1Num=0;//一般告警
|
int warning1Num=0;//一般告警
|
||||||
int warning2Num=0;//严重告警
|
int warning2Num=0;//严重告警
|
||||||
|
|
||||||
@ -79,14 +79,14 @@ public class IndexController extends BasicController{
|
|||||||
}
|
}
|
||||||
|
|
||||||
for(GnssStatus status:deviceList){
|
for(GnssStatus status:deviceList){
|
||||||
if(status.getState() != GnssStatus.STATE_OFFLINE) deviceOnlineNum++;
|
if(status.getState() == GnssStatus.STATE_OFFLINE) deviceOfflineNum++;
|
||||||
if(status.getWarning() == WarningCfg.LEVEL_1) warning1Num++;
|
if(status.getWarning() == WarningCfg.LEVEL_1) warning1Num++;
|
||||||
else if(status.getWarning() == WarningCfg.LEVEL_2) warning2Num++;
|
else if(status.getWarning() == WarningCfg.LEVEL_2) warning2Num++;
|
||||||
}
|
}
|
||||||
|
|
||||||
m.addAttribute("deviceDeployedNum", deviceDeployedNum);
|
m.addAttribute("deviceDeployedNum", deviceDeployedNum);
|
||||||
m.addAttribute("deviceOnlineNum", deviceOnlineNum);
|
m.addAttribute("deviceOnlineNum", deviceDeployedNum-deviceOfflineNum);
|
||||||
m.addAttribute("deviceOfflineNum", deviceDeployedNum - deviceOnlineNum);
|
m.addAttribute("deviceOfflineNum", deviceOfflineNum);
|
||||||
m.addAttribute("warning1Num", warning1Num);
|
m.addAttribute("warning1Num", warning1Num);
|
||||||
m.addAttribute("warning2Num", warning2Num);
|
m.addAttribute("warning2Num", warning2Num);
|
||||||
m.addAttribute("warningTotalNum", warning1Num+warning2Num);
|
m.addAttribute("warningTotalNum", warning1Num+warning2Num);
|
||||||
|
|||||||
Loading…
x
Reference in New Issue
Block a user