查询开关阀记录相关修改

liurunyu

5 天以前 e8937f27fce194d015ce6c27d286e7fc89f5e580

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

@@ -1,5 +1,6 @@
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;
@@ -13,8 +14,6 @@
import org.apache.dubbo.common.utils.PojoUtils;
import org.springframework.stereotype.Service;

import java.time.LocalDate;
import java.time.LocalDateTime;
import java.util.List;
import java.util.Map;

@@ -51,16 +50,7 @@
     * @return
     */
    public QueryResultVo<List<VoOnHour>> getOnHourReportsHistory(OnHourQO 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);
        }
        qo.completionTime();

        Map<String, Object> params = (Map<String, Object>) PojoUtils.generalize(qo);
        Long itemTotal = rmOnHourReportHistoryMapper.getOnHourReportsCount_history(params);
@@ -80,16 +70,7 @@
     * @return
     */
    public QueryResultVo<List<VoOnHour>> getOnHourReportsLast(OnHourQO 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);
        }
        qo.completionTime();

        Map<String, Object> params = (Map<String, Object>) PojoUtils.generalize(qo);
        Long itemTotal = rmOnHourReportLastMapper.getOnHourReportsCount_last(params);
@@ -109,37 +90,12 @@
     * @return
     */
    public QueryResultVo<List<VoOpenCloseValve>> getOpenCloseValveReports_history(OpenCloseValveQO qo) {
        String timeStart_open = qo.getTimeStart_open();
        String timeStop_open = qo.getTimeStop_open();
        if(timeStart_open != null && timeStart_open != "") {
            timeStart_open = timeStart_open + " 00:00:00";
        } else {
            timeStart_open = LocalDateTime.of(2024, 1, 1, 0, 0, 0).toString();
        }
        qo.setTimeStop_open(timeStart_open);
        //下面由completionTimeNoEmpty()改为completionTime()原因，
        //开关阀记录中开阀时间和关阀时间有时不会同时有值，可能其中任一个是null值，如果用时间条件查询，则这样的记录就查不出来了。
        //如果要缩小所查询记录的范围（数量），则可从记录ID上设备一个范围。
        //qo.completionTimeNoEmpty() ;
        qo.completionTime() ;

        if(timeStop_open != null && timeStop_open != "") {
            timeStop_open = timeStop_open + " 23:59:59";
        }else {
            timeStop_open = LocalDate.now() + " 23:59:59";
        }
        qo.setTimeStop_open(timeStop_open);

        String timeStart_close = qo.getTimeStart_close();
        String timeStop_close = qo.getTimeStop_close();
        if(timeStart_close != null && timeStart_close != "") {
            timeStart_close = timeStart_close + " 00:00:00";
        } else {
            timeStart_close = LocalDateTime.of(2024, 1, 1, 0, 0, 0).toString();
        }
        qo.setTimeStart_close(timeStart_close);

        if(timeStop_close != null && timeStop_close != "") {
            timeStop_close = timeStop_close + " 23:59:59";
        }else {
            timeStop_close = LocalDate.now() + " 23:59:59";
        }
        qo.setTimeStop_close(timeStop_close);

        Map<String, Object> params = (Map<String, Object>) PojoUtils.generalize(qo);
        Long itemTotal = rmOpenCloseValveHistoryMapper.getOpenCloseValveReportsCount_history(params);
@@ -149,7 +105,18 @@
        rsVo.pageCurr = qo.pageCurr ;

        rsVo.calculateAndSet(itemTotal, params);
        rsVo.obj = rmOpenCloseValveHistoryMapper.getOpenCloseValveReports_history(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()));
                if(vo.getClType() != null) {
                    vo.setCloseType(CommonV1.openCloseValveType(vo.getClType() == null ? (byte) 100 : vo.getClType()));
                }else{
                    vo.setCloseType("");
                }
            }
        }
        rsVo.obj = list;
        return rsVo ;
    }

@@ -159,27 +126,7 @@
     * @return
     */
    public QueryResultVo<List<VoOpenCloseValve>> getOpenCloseValveReports_last(OpenCloseValveQO qo) {
        String timeStart_open = qo.getTimeStart_open();
        String timeStop_open = qo.getTimeStop_open();
        if(timeStart_open != null) {
            timeStart_open = timeStart_open + " 00:00:00";
            qo.setTimeStop_open(timeStart_open);
        }
        if(timeStop_open != null) {
            timeStop_open = timeStop_open + " 23:59:59";
            qo.setTimeStop_open(timeStop_open);
        }

        String timeStart_close = qo.getTimeStart_close();
        String timeStop_close = qo.getTimeStop_close();
        if(timeStart_close != null) {
            timeStart_close = timeStart_close + " 00:00:00";
            qo.setTimeStart_close(timeStart_close);
        }
        if(timeStop_close != null) {
            timeStop_close = timeStop_close + " 23:59:59";
            qo.setTimeStop_close(timeStop_close);
        }
        qo.completionTime() ;

        Map<String, Object> params = (Map<String, Object>) PojoUtils.generalize(qo);
        Long itemTotal = rmOpenCloseValveLastMapper.getOpenCloseValveReportsCount_last(params);
@@ -189,7 +136,18 @@
        rsVo.pageCurr = qo.pageCurr ;

        rsVo.calculateAndSet(itemTotal, params);
        rsVo.obj = rmOpenCloseValveLastMapper.getOpenCloseValveReports_last(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()));
                if(vo.getClType() != null){
                    vo.setCloseType(CommonV1.openCloseValveType(vo.getClType()==null?(byte)100:vo.getClType()));
                }else{
                    vo.setCloseType("");
                }
            }
        }
        rsVo.obj = list;
        return rsVo ;
    }

@@ -199,16 +157,7 @@
     * @return
     */
    public QueryResultVo<List<VoTiming>> getTimingReportsHistory(OnHourQO 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);
        }
        qo.completionTime() ;

        Map<String, Object> params = (Map<String, Object>) PojoUtils.generalize(qo);
        Long itemTotal = rmTimingReportHistoryMapper.getTimingReportsCount_history(params);
@@ -228,16 +177,7 @@
     * @return
     */
    public QueryResultVo<List<VoTiming>> getTimingReportsLast(OnHourQO 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);
        }
        qo.completionTime() ;

        Map<String, Object> params = (Map<String, Object>) PojoUtils.generalize(qo);
        Long itemTotal = rmTimingReportLastMapper.getTimingReportsCount_last(params);
@@ -257,16 +197,7 @@
     * @return
     */
    public QueryResultVo<List<VoWork>> getWorkReportsHistory(OnHourQO 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);
        }
        qo.completionTime() ;

        Map<String, Object> params = (Map<String, Object>) PojoUtils.generalize(qo);
        Long itemTotal = rmWorkReportHistoryMapper.getWorkReportsCount_history(params);
@@ -286,16 +217,7 @@
     * @return
     */
    public QueryResultVo<List<VoWork>> getWorkReportsLast(OnHourQO 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);
        }
        qo.completionTime() ;

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