1、通信协议要增加版本号（目的为远程升级准备），原来没有版本号的协议默认为版本号为1，所以调整了程序命名； 2、流浪控制器与控制器数据库表都增加了协议...

liurunyu

2024-11-01 001f24d4efd7b818bc2224b976c82faf4f9e564c

 pipIrr-platform/pipIrr-web/pipIrr-web-remote/src/main/java/com/dy/pipIrrRemote/report/ReportSv.java

@@ -1,9 +1,14 @@
package com.dy.pipIrrRemote.report;

import com.dy.common.mw.protocol.p206V1.CommonV1;
import com.dy.common.webUtil.QueryResultVo;
import com.dy.pipIrrGlobal.daoRm.*;
import com.dy.pipIrrGlobal.voRm.VoOnHour;
import com.dy.pipIrrRemote.report.qo.ReportQO;
import com.dy.pipIrrGlobal.voRm.VoOpenCloseValve;
import com.dy.pipIrrGlobal.voRm.VoTiming;
import com.dy.pipIrrGlobal.voRm.VoWork;
import com.dy.pipIrrRemote.report.qo.OnHourQO;
import com.dy.pipIrrRemote.report.qo.OpenCloseValveQO;
import lombok.RequiredArgsConstructor;
import lombok.extern.slf4j.Slf4j;
import org.apache.dubbo.common.utils.PojoUtils;
@@ -44,17 +49,8 @@
     * @param qo
     * @return
     */
    public QueryResultVo<List<VoOnHour>> getOnHourReportsHistory(ReportQO qo) {
        String timeStart = qo.getTimeStart();
        String timeStop = qo.getTimeStop();
        if(timeStart != null) {
            timeStart = timeStart + " 00:00:00";
            qo.setTimeStart(timeStart);
        }
        if(timeStop != null) {
            timeStop = timeStop + " 23:59:59";
            qo.setTimeStop(timeStop);
        }
    public QueryResultVo<List<VoOnHour>> getOnHourReportsHistory(OnHourQO qo) {
        qo.completionTime();

        Map<String, Object> params = (Map<String, Object>) PojoUtils.generalize(qo);
        Long itemTotal = rmOnHourReportHistoryMapper.getOnHourReportsCount_history(params);
@@ -68,5 +64,157 @@
        return rsVo ;
    }

    /**
     * 根据指定条件获取整点报最新记录
     * @param qo
     * @return
     */
    public QueryResultVo<List<VoOnHour>> getOnHourReportsLast(OnHourQO qo) {
        qo.completionTime();

        Map<String, Object> params = (Map<String, Object>) PojoUtils.generalize(qo);
        Long itemTotal = rmOnHourReportLastMapper.getOnHourReportsCount_last(params);

        QueryResultVo<List<VoOnHour>> rsVo = new QueryResultVo<>() ;
        rsVo.pageSize = qo.pageSize ;
        rsVo.pageCurr = qo.pageCurr ;

        rsVo.calculateAndSet(itemTotal, params);
        rsVo.obj = rmOnHourReportLastMapper.getOnHourReports_last(params);
        return rsVo ;
    }

    /**
     * 根据指定条件获取开关阀报历史记录
     * @param qo
     * @return
     */
    public QueryResultVo<List<VoOpenCloseValve>> getOpenCloseValveReports_history(OpenCloseValveQO qo) {
        qo.completionTimeNoEmpty() ;

        Map<String, Object> params = (Map<String, Object>) PojoUtils.generalize(qo);
        Long itemTotal = rmOpenCloseValveHistoryMapper.getOpenCloseValveReportsCount_history(params);

        QueryResultVo<List<VoOpenCloseValve>> rsVo = new QueryResultVo<>() ;
        rsVo.pageSize = qo.pageSize ;
        rsVo.pageCurr = qo.pageCurr ;

        rsVo.calculateAndSet(itemTotal, params);
        List<VoOpenCloseValve> list = rmOpenCloseValveHistoryMapper.getOpenCloseValveReports_history(params);
        if (list != null && list.size() > 0) {
            for (VoOpenCloseValve vo : list) {
                vo.setOpenType(CommonV1.openCloseValveType(vo.getOpType()==null?(byte)100:vo.getOpType()));
                vo.setCloseType(CommonV1.openCloseValveType(vo.getClType()==null?(byte)100:vo.getClType()));
            }
        }
        rsVo.obj = list;
        return rsVo ;
    }

    /**
     * 根据指定条件获取开关阀报最新记录
     * @param qo
     * @return
     */
    public QueryResultVo<List<VoOpenCloseValve>> getOpenCloseValveReports_last(OpenCloseValveQO qo) {
        qo.completionTime() ;

        Map<String, Object> params = (Map<String, Object>) PojoUtils.generalize(qo);
        Long itemTotal = rmOpenCloseValveLastMapper.getOpenCloseValveReportsCount_last(params);

        QueryResultVo<List<VoOpenCloseValve>> rsVo = new QueryResultVo<>() ;
        rsVo.pageSize = qo.pageSize ;
        rsVo.pageCurr = qo.pageCurr ;

        rsVo.calculateAndSet(itemTotal, params);
        List<VoOpenCloseValve> list = rmOpenCloseValveLastMapper.getOpenCloseValveReports_last(params);
        if (list != null && list.size() > 0) {
            for (VoOpenCloseValve vo : list) {
                vo.setOpenType(CommonV1.openCloseValveType(vo.getOpType()==null?(byte)100:vo.getOpType()));
                vo.setCloseType(CommonV1.openCloseValveType(vo.getClType()==null?(byte)100:vo.getClType()));
            }
        }
        rsVo.obj = list;
        return rsVo ;
    }

    /**
     * 根据指定条件获取定时报历史记录
     * @param qo
     * @return
     */
    public QueryResultVo<List<VoTiming>> getTimingReportsHistory(OnHourQO qo) {
        qo.completionTime() ;

        Map<String, Object> params = (Map<String, Object>) PojoUtils.generalize(qo);
        Long itemTotal = rmTimingReportHistoryMapper.getTimingReportsCount_history(params);

        QueryResultVo<List<VoTiming>> rsVo = new QueryResultVo<>() ;
        rsVo.pageSize = qo.pageSize ;
        rsVo.pageCurr = qo.pageCurr ;

        rsVo.calculateAndSet(itemTotal, params);
        rsVo.obj = rmTimingReportHistoryMapper.getTimingReports_history(params);
        return rsVo ;
    }

    /**
     * 根据指定条件获取定时报最新记录
     * @param qo
     * @return
     */
    public QueryResultVo<List<VoTiming>> getTimingReportsLast(OnHourQO qo) {
        qo.completionTime() ;

        Map<String, Object> params = (Map<String, Object>) PojoUtils.generalize(qo);
        Long itemTotal = rmTimingReportLastMapper.getTimingReportsCount_last(params);

        QueryResultVo<List<VoTiming>> rsVo = new QueryResultVo<>() ;
        rsVo.pageSize = qo.pageSize ;
        rsVo.pageCurr = qo.pageCurr ;

        rsVo.calculateAndSet(itemTotal, params);
        rsVo.obj = rmTimingReportLastMapper.getTimingReports_last(params);
        return rsVo ;
    }

    /**
     * 根据指定条件获取工作报历史记录
     * @param qo
     * @return
     */
    public QueryResultVo<List<VoWork>> getWorkReportsHistory(OnHourQO qo) {
        qo.completionTime() ;

        Map<String, Object> params = (Map<String, Object>) PojoUtils.generalize(qo);
        Long itemTotal = rmWorkReportHistoryMapper.getWorkReportsCount_history(params);

        QueryResultVo<List<VoWork>> rsVo = new QueryResultVo<>() ;
        rsVo.pageSize = qo.pageSize ;
        rsVo.pageCurr = qo.pageCurr ;

        rsVo.calculateAndSet(itemTotal, params);
        rsVo.obj = rmWorkReportHistoryMapper.getWorkReports_history(params);
        return rsVo ;
    }

    /**
     * 根据指定条件获取工作报最新记录
     * @param qo
     * @return
     */
    public QueryResultVo<List<VoWork>> getWorkReportsLast(OnHourQO qo) {
        qo.completionTime() ;

        Map<String, Object> params = (Map<String, Object>) PojoUtils.generalize(qo);
        Long itemTotal = rmWorkReportLastMapper.getWorkReportsCount_last(params);

        QueryResultVo<List<VoWork>> rsVo = new QueryResultVo<>() ;
        rsVo.pageSize = qo.pageSize ;
        rsVo.pageCurr = qo.pageCurr ;

        rsVo.calculateAndSet(itemTotal, params);
        rsVo.obj = rmWorkReportLastMapper.getWorkReports_last(params);
        return rsVo ;
    }
}