远程监控中开关阀记录查询重构，增加了水价信息，调整了显示内容，优化SQL语句，开闭阀类型改为通信协议中的Common*.*.java中的统一匹配。

liurunyu

2024-10-28 1f46976c9ee72d7889fceee968db9c8aef885eca

 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_0_0.CommonV1_0_1;
import com.dy.common.webUtil.QueryResultVo;
import com.dy.pipIrrGlobal.daoRm.*;
import com.dy.pipIrrGlobal.voRm.VoOnHour;
@@ -114,9 +115,9 @@
        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();
            timeStart_open = LocalDateTime.now().minusDays(30) + " 00:00:00";
        }
        qo.setTimeStop_open(timeStart_open);
        qo.setTimeStart_open(timeStart_open);

        if(timeStop_open != null && timeStop_open != "") {
            timeStop_open = timeStop_open + " 23:59:59";
@@ -130,7 +131,7 @@
        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();
            timeStart_close = LocalDate.now().minusDays(30) + " 00:00:00";
        }
        qo.setTimeStart_close(timeStart_close);

@@ -149,7 +150,14 @@
        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_0_1.openCloseValveType(vo.getOpenType_()==null?(byte)100:vo.getOpenType_()));
                vo.setCloseType(CommonV1_0_1.openCloseValveType(vo.getCloseType_()==null?(byte)100:vo.getCloseType_()));
            }
        }
        rsVo.obj = list;
        return rsVo ;
    }

@@ -163,7 +171,7 @@
        String timeStop_open = qo.getTimeStop_open();
        if(timeStart_open != null) {
            timeStart_open = timeStart_open + " 00:00:00";
            qo.setTimeStop_open(timeStart_open);
            qo.setTimeStart_open(timeStart_open);
        }
        if(timeStop_open != null) {
            timeStop_open = timeStop_open + " 23:59:59";
@@ -189,7 +197,14 @@
        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_0_1.openCloseValveType(vo.getOpenType_()==null?(byte)100:vo.getOpenType_()));
                vo.setCloseType(CommonV1_0_1.openCloseValveType(vo.getCloseType_()==null?(byte)100:vo.getCloseType_()));
            }
        }
        rsVo.obj = list;
        return rsVo ;
    }