pipIrr-platform/pipIrr-mw/pipIrr-mw-accept/src/main/java/com/dy/aceMw/server/rtuData/dbSv/DbSv.java
@@ -2,12 +2,14 @@
import com.dy.pipIrrGlobal.daoPr.PrControllerMapper;
import com.dy.pipIrrGlobal.daoPr.PrControllerTrampMapper;
import com.dy.pipIrrGlobal.daoPr.PrIntakeMapper;
import com.dy.pipIrrGlobal.daoRm.RmAlarmStateHistoryMapper;
import com.dy.pipIrrGlobal.daoRm.RmAlarmStateLastMapper;
import com.dy.pipIrrGlobal.daoRm.RmAutoReportHistoryMapper;
import com.dy.pipIrrGlobal.daoRm.RmAutoReportLastMapper;
import com.dy.pipIrrGlobal.pojoPr.PrController;
import com.dy.pipIrrGlobal.pojoPr.PrControllerTramp;
import com.dy.pipIrrGlobal.pojoPr.PrIntake;
import com.dy.pipIrrGlobal.pojoRm.RmAlarmStateHistory;
import com.dy.pipIrrGlobal.pojoRm.RmAlarmStateLast;
import com.dy.pipIrrGlobal.pojoRm.RmAutoReportHistory;
@@ -44,13 +46,14 @@
    @Lazy
    private DbSv sv ;
    /**
     * 通过控制器地址从数据库表中查询控制器
     * @param rtuAddr 控制器地址
     * @return 控制器
     */
    public PrController getPrControllerByRtuAddr(String rtuAddr){
        List<PrController> list = this.prControllerMapperDao.getControllersByRtuAddr(rtuAddr) ;
        List<PrController> list = this.prControllerMapperDao.getControllersByRtuAddrAndIntakeNotNull(rtuAddr) ;
        if(list != null && list.size() > 0){
            return list.get(0) ;
        }