| | |
| | | topDto.setCaptestTimelong(deviceState.getDevCaptestTimelong()); |
| | | topDto.setCaptestCap(deviceState.getDevCaptestCap()); |
| | | //剩余容量和剩余时间计算 |
| | | Float restCap = batttestdataInfService.getLastTestDataRestCap(realDto.getBattgroupId()); |
| | | Float restCap = batttestdataInfService.getLastTestDataRestCap(binf.getMoncapstd(),realDto.getBattgroupId()); |
| | | topDto.setRestCap(restCap); |
| | | //实时组端电流,剩余容量,标称容量 |
| | | if(battRtstate!=null){ |
| | |
| | | Integer allALmNum = battALmNum + devALmNum + pwrALmNum; |
| | | topDto.setAllALmNum(allALmNum); |
| | | topDto.setSystemState((allALmNum > 0 ? 1 : 0)); |
| | | topDto.setSystemStateName((allALmNum > 0 ? "系统异常" : "系统正常")); |
| | | topDto.setSystemStateName((allALmNum > 0 ? "异常" : "正常")); |
| | | } |
| | | return new Response().setII(1, true, topDto, "实时页面头部数据推送"); |
| | | } catch (Exception e) { |