pipIrr-SV.git - Gitblit

			@@ -13,6 +13,8 @@
			import com.dy.pipIrrGlobal.voLargeScreen.VoBaseInfo;
			import com.dy.pipIrrGlobal.voLargeScreen.VoCurrentInfo;
			import com.dy.pipIrrGlobal.voLargeScreen.VoMonitorInfo;
			import com.dy.pipIrrGlobal.voMd.VoCropsSimple;
			import com.dy.pipIrrGlobal.voMd.VoEt0Simple;
			import com.dy.pipIrrGlobal.voSpecial.VoTopXClient;
			import com.dy.pipIrrGlobal.voSpecial.VoTopXIntake;
			import lombok.extern.slf4j.Slf4j;
			@@ -78,14 +80,17 @@
			Integer[] result = this.queryMwOnAndOffLine() ;
			vo.cTotalCountOfOnLine = result[0] ;
			vo.cTotalCountOfOffLine = totalCountOfIntake - vo.cTotalCountOfOnLine;
			vo.cTotalCountOfOffLine = vo.cTotalCountOfOffLine < 0 ? 0 : vo.cTotalCountOfOffLine ;

			vo.cTotalCountOfOpenValve = this.dao.totalCountOfOpenValve(dtAtXHourBefore) ;
			vo.cTotalCountOfCloseValve = this.dao.totalCountOfCloseValve(dtAtXHourBefore) ;
			vo.cTotalCountOfUnknownValve = totalCountOfIntake - vo.cTotalCountOfOpenValve - vo.cTotalCountOfCloseValve;
			vo.cTotalCountOfUnknownValve = vo.cTotalCountOfUnknownValve < 0 ? 0 : vo.cTotalCountOfUnknownValve ;

			vo.cTotalCountOfAlarm = this.dao.totalCountOfAlarm(dtAtXHourBefore) ;
			vo.cTotalCountOfNoAlarm = this.dao.totalCountOfNoAlarm(dtAtXHourBefore) ;
			vo.cTotalCountOfUnknownAlarm = totalCountOfIntake - vo.cTotalCountOfAlarm - vo.cTotalCountOfNoAlarm;
			vo.cTotalCountOfUnknownAlarm = vo.cTotalCountOfUnknownAlarm < 0 ? 0 : vo.cTotalCountOfUnknownAlarm ;
			return vo ;
			}

			@@ -167,4 +172,22 @@
			return this.dao.topXIntakeAtCertainDay(idStart, idEnd, 5) ;
			}


			/**
			* 所有作物
			* @return 实体集合
			*/
			public List<VoCropsSimple> allCropts(){
			return this.dao.allCropts() ;
			}
			/**
			* 所有作物
			* @return 实体集合
			*/
			public List<VoEt0Simple> et0InWeek(Long cropId){
			String startDate = DateTime.lastXDay_yyyy_MM_dd(8) ;//8天前
			String endDate = DateTime.lastXDay_yyyy_MM_dd(1) ;//昨天
			return this.dao.et0InWeek(cropId, startDate, endDate) ;
			}

			}