liurunyu
2025-02-10 db3d504e9d53c3851b51d9e383e22c95b1fc9ea4
pipIrr-platform/pipIrr-web/pipIrr-web-statistics/src/main/java/com/dy/pipIrrStatistics/largeScreen/Ls4StatisticsSv.java
@@ -72,14 +72,16 @@
        Date dtAtXHourBefore = DateTime.dateFrom_yyyy_MM_dd_HH_mm_ss(DateTime.lastXHour_yyyy_MM_dd_HH_mm_ss(24)) ;//X个小时前
        VoCurrentInfo vo = new VoCurrentInfo() ;
        Integer[] result = this.queryMwOnAndOffLine() ;
        vo.totalCountOfOnLine = result[0] ;
        vo.totalCountOfOffLine = totalCountOfIntake - vo.totalCountOfOnLine; ;
        vo.totalCountOfOpenValve = this.dao.totalCountOfOpenValve(dtAtXHourBefore) ;
        vo.totalCountOfCloseValve = this.dao.totalCountOfCloseValve(dtAtXHourBefore) ;
        vo.totalCountOfUnknownValve = totalCountOfIntake - vo.totalCountOfOpenValve - vo.totalCountOfCloseValve ;
        vo.totalCountOfAlarm = this.dao.totalCountOfAlarm(dtAtXHourBefore) ;
        vo.totalCountOfNoAlarm = this.dao.totalCountOfNoAlarm(dtAtXHourBefore) ;
        vo.totalCountOfUnknownAlarm = totalCountOfIntake - vo.totalCountOfAlarm - vo.totalCountOfNoAlarm ;
        vo.cTotalCountOfOnLine = result[0] ;
        vo.cTotalCountOfOffLine = totalCountOfIntake - vo.cTotalCountOfOnLine;
        vo.cTotalCountOfOpenValve = this.dao.totalCountOfOpenValve(dtAtXHourBefore) ;
        vo.cTotalCountOfCloseValve = this.dao.totalCountOfCloseValve(dtAtXHourBefore) ;
        vo.cTotalCountOfUnknownValve = totalCountOfIntake - vo.cTotalCountOfOpenValve - vo.cTotalCountOfCloseValve;
        vo.cTotalCountOfAlarm = this.dao.totalCountOfAlarm(dtAtXHourBefore) ;
        vo.cTotalCountOfNoAlarm = this.dao.totalCountOfNoAlarm(dtAtXHourBefore) ;
        vo.cTotalCountOfUnknownAlarm = totalCountOfIntake - vo.cTotalCountOfAlarm - vo.cTotalCountOfNoAlarm;
        return vo ;
    }
@@ -87,8 +89,20 @@
     * 监测信息统计
     * @return
     */
    public VoMonitorInfo monitorInfo(Date startDt){
    public VoMonitorInfo monitorInfo(Date fromDt){
        VoMonitorInfo vo = new VoMonitorInfo() ;
        vo.mTotalCountOfReport = this.dao.mTotalCountOfReport(fromDt) ;
        vo.mTotalCountOfNoReport = this.dao.mTotalCountOfNoReport(fromDt) ;
        vo.mTotalCountOfNeverReport = this.dao.mTotalCountOfNeverReport() ;
        vo.mTotalCountOfOpenValve = this.dao.mTotalCountOfOpenValve(fromDt) ;
        vo.mTotalCountOfCloseValve = this.dao.mTotalCountOfCloseValve(fromDt) ;
        vo.mTotalCountOfNeverOpenValve = this.dao.mTotalCountOfNeverOpenValve() ;
        vo.mTotalCountOfAlarm = this.dao.mTotalCountOfAlarm(fromDt) ;
        vo.mTotalCountOfNoAlarm = this.dao.mTotalCountOfNoAlarm(fromDt) ;
        vo.mTotalCountOfNeverAlarm = this.dao.mTotalCountOfNeverAlarm() ;
        return vo ;
    }