Merge branch 'master' of http://8.140.179.55:20000/r/pipIrr-SV

liurunyu

2025-03-26 b4bc05b29aa6d71072efdf39caf1808b4e69eca4

 pipIrr-platform/pipIrr-web/pipIrr-web-statistics/src/main/java/com/dy/pipIrrStatistics/special/SpecialSv.java

@@ -4,13 +4,12 @@
import com.dy.common.util.DateTime;
import com.dy.common.webUtil.QueryResultVo;
import com.dy.pipIrrGlobal.daoSpecial.SpecialMapper;
import com.dy.pipIrrGlobal.voSpecial.CoAbnormalCloseValve;
import com.dy.pipIrrGlobal.voSpecial.VoAbnormalCloseValve;
import com.dy.pipIrrGlobal.voSpecial.VoSteal;
import lombok.extern.slf4j.Slf4j;
import org.apache.dubbo.common.utils.PojoUtils;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;

import java.util.List;
import java.util.Map;
import java.util.Optional;
@@ -32,11 +31,11 @@

    /**
     * 涉嫌偷水统计
     * @param qo
     * @return
     * @param qo 查询参数
     * @return 数据集合
     */
    public QueryResultVo<List<VoSteal>> steal(QoSteal qo) throws Exception {
        if(qo.fromDt != null && qo.fromDt != "") {
        if(qo.fromDt != null && !qo.fromDt.trim().equals("")) {
            qo.fromDate = DateTime.dateFrom_yyyy_MM_dd_HH_mm_ss(qo.fromDt + " 00:00:00") ;
        }

@@ -62,12 +61,12 @@


    /**
     * 涉嫌偷水统计
     * @param qo
     * @return
     * 异常关阀统计
     * @param qo 查询参数
     * @return 数据集合
     */
    public QueryResultVo<List<CoAbnormalCloseValve>> abnormalCloseValve(QoAbnormalCloseValve qo) throws Exception {
        if(qo.atDt != null && qo.atDt != "") {
    public QueryResultVo<List<VoAbnormalCloseValve>> abnormalCloseValve(QoAbnormalCloseValve qo) throws Exception {
        if(qo.atDt != null && !qo.atDt.trim().equals("")) {
            qo.atDateStart = DateTime.dateFrom_yyyy_MM_dd_HH_mm_ss(qo.atDt + " 00:00:00") ;
            qo.atDateEnd = DateTime.dateFrom_yyyy_MM_dd_HH_mm_ss(qo.atDt + " 23:59:59") ;
        }
@@ -76,14 +75,14 @@

        Long itemTotal = Optional.ofNullable(this.dao.selectAbnormalCloseValveTotal(params)).orElse(0L);

        QueryResultVo<List<CoAbnormalCloseValve>> rsVo = new QueryResultVo<>() ;
        QueryResultVo<List<VoAbnormalCloseValve>> rsVo = new QueryResultVo<>() ;
        rsVo.pageSize = qo.pageSize ;
        rsVo.pageCurr = qo.pageCurr ;
        rsVo.calculateAndSet(itemTotal, params);

        List<CoAbnormalCloseValve> list = this.dao.selectAbnormalCloseValveSome(params) ;
        List<VoAbnormalCloseValve> list = this.dao.selectAbnormalCloseValveSome(params) ;
        if (list != null && list.size() > 0) {
            for (CoAbnormalCloseValve vo : list) {
            for (VoAbnormalCloseValve vo : list) {
                vo.openType = CommonV1.openCloseValveType(vo.opType) ;
                vo.closeType = CommonV1.openCloseValveType(vo.clType) ;
            }