开关阀记录中，对于当前未关阀的记录，不进行关阀类型名称翻译

liurunyu

2025-02-14 7bd3b76929e9a126b237ab9e1c8c82e7d20a4a6a

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

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

import com.dy.common.mw.protocol.p206V1_0_0.CommonV1_0_1;
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;
@@ -103,8 +103,12 @@
        List<VoOpenCloseValve> list = rmOpenCloseValveHistoryMapper.getOpenCloseValveReports_history(params);
        if (list != null && list.size() > 0) {
            for (VoOpenCloseValve vo : list) {
                vo.setOpenType(CommonV1_0_1.openCloseValveType(vo.getOpType()==null?(byte)100:vo.getOpType()));
                vo.setCloseType(CommonV1_0_1.openCloseValveType(vo.getClType()==null?(byte)100:vo.getClType()));
                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;
@@ -130,8 +134,12 @@
        List<VoOpenCloseValve> list = rmOpenCloseValveLastMapper.getOpenCloseValveReports_last(params);
        if (list != null && list.size() > 0) {
            for (VoOpenCloseValve vo : list) {
                vo.setOpenType(CommonV1_0_1.openCloseValveType(vo.getOpType()==null?(byte)100:vo.getOpType()));
                vo.setCloseType(CommonV1_0_1.openCloseValveType(vo.getClType()==null?(byte)100:vo.getClType()));
                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;