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

liurunyu

2025-08-15 de31eed424e62a219d6378fe193e615a8584ae0c

 pipIrr-platform/pipIrr-web/pipIrr-web-statistics/src/main/java/com/dy/pipIrrStatistics/intake/IntakeSv.java

@@ -41,9 +41,6 @@
    @Autowired
    private RmLossDayLastMapper rmLossDayLastMapper;

    @Value("${rtu.batteryVolt}")
    private Double batteryVolt;

    @Value("${rtu.signalIntensity.weak}")
    private Integer weak;

@@ -55,29 +52,10 @@
     * @param qo
     * @return
     */
    public QueryResultVo<List<VoIntake>> getNotOnlineIntakes(CommonQO qo) {
        DecimalFormat df = new DecimalFormat("0.00");
        /**
         * 补齐起止时间，如果开始时间为空，则默认为当前日期
         */
        String timeStart = qo.getTimeStart();
        String timeStop = qo.getTimeStop();

        if(timeStop != null) {
            timeStop = timeStop + " 23:59:59";
            if(timeStart != null) {
                timeStart = timeStart + " 00:00:00";
            }else {
                timeStart = LocalDate.now() + " 00:00:00";
            }
        }else {
            timeStart = null;
        }
        qo.setTimeStart(timeStart);
        qo.setTimeStop(timeStop);

        // 生成查询参数
    public QueryResultVo<List<VoIntake>> getNotOnlineIntakes(CommonQO qo, Long idStart, Long idEnd) {
        Map<String, Object> params = (Map<String, Object>) PojoUtils.generalize(qo) ;
        params.put("idStart", idStart) ;
        params.put("idEnd", idEnd) ;

        // 获取符合条件的记录数
        Long itemTotal = Optional.ofNullable(rmOnHourReportHistoryMapper.getNotOnlineIntakesCount(params)).orElse(0L);
@@ -89,6 +67,24 @@

        rsVo.calculateAndSet(itemTotal, params);
        rsVo.obj = rmOnHourReportHistoryMapper.getNotOnlineIntakes(params);
        return rsVo ;
    }

    /**
     * 最近未报数的取水口
     * @param qo
     * @return
     */
    public QueryResultVo<List<VoIntakeUnReported>> getUnReportedIntakes(CommonQO qo) {
        Map<String, Object> params = (Map<String, Object>) PojoUtils.generalize(qo);
        Long itemTotal = rmOnHourReportLastMapper.getUnReportedIntakesCount(params);

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

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

@@ -142,7 +138,6 @@
     * @return
     */
    public QueryResultVo<List<VoBatteryVolt>> getUnderVoltIntakes(BatteryVoltQO qo) {
        qo.setBatteryVolt(batteryVolt);
        // 生成查询参数
        Map<String, Object> params = (Map<String, Object>) PojoUtils.generalize(qo) ;

@@ -186,33 +181,21 @@

    /**
     * 获取从未开过阀的取水口
     * @param qo
     * @param idStart
     * @param idEnd
     * @return
     */
    public QueryResultVo<List<VoIntake>> getNeverOpenValveIntakes(CommonQO qo) {

        String timeStart = qo.getTimeStart();
        String timeStop = qo.getTimeStop();
        if(timeStart != null && timeStart != "") {
            timeStart = timeStart + " 00:00:00";
        } else {
            timeStart = LocalDate.now() + " 00:00:00";
        }
        qo.setTimeStart(timeStart);

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

    public QueryResultVo<List<VoIntakeUnOpenValve>> getNeverOpenValveIntakes(CommonQO qo, Long idStart, Long idEnd) {
        // 生成查询参数
        Map<String, Object> params = (Map<String, Object>) PojoUtils.generalize(qo) ;
        params.put("idStart", idStart) ;
        params.put("idEnd", idEnd) ;

        // 获取符合条件的记录数
        Long itemTotal = Optional.ofNullable(rmOpenCloseValveHistoryMapper.getNeverOpenValveIntakesCount(params)).orElse(0L);

        QueryResultVo<List<VoIntake>> rsVo = new QueryResultVo<>() ;
        QueryResultVo<List<VoIntakeUnOpenValve>> rsVo = new QueryResultVo<>() ;

        rsVo.pageSize = qo.pageSize ;
        rsVo.pageCurr = qo.pageCurr ;
@@ -283,7 +266,7 @@
        List<VoCountOfOpenType> list = rmOpenCloseValveLastMapper.getCountByOpenType(params) ;
        if(list != null){
            for (VoCountOfOpenType vo : list) {
                if (vo.openType == null){
                if (vo.openType != null){
                    switch (vo.openType) {
                        case 1:
                            vo.openTypeName = "刷卡开阀";
@@ -300,6 +283,8 @@
                        default:
                            vo.openTypeName = "未知类型开阀";
                    }
                }else{
                    vo.openTypeName = "未知类型开阀";
                }
            }
        }
@@ -322,39 +307,43 @@
        List<VoCountOfCloseType> list = rmOpenCloseValveLastMapper.getCountByCloseType(params) ;
        if(list != null) {
            for (VoCountOfCloseType vo : list) {
                switch (vo.closeType) {
                    case 2:
                        vo.closeTypeName = "刷卡关阀";
                        break;
                    case 4:
                        vo.closeTypeName = "中心站关阀";
                        break;
                    case 5:
                        vo.closeTypeName = "欠费关阀";
                        break;
                    case 6:
                        vo.closeTypeName = "流量计故障关阀";
                        break;
                    case 7:
                        vo.closeTypeName = "紧急关阀";
                        break;
                    case 9:
                        vo.closeTypeName = "用户远程关阀";
                        break;
                    case 10:
                        vo.closeTypeName = "巡检卡关阀";
                        break;
                    case 12:
                        vo.closeTypeName = "黑名单命令关阀";
                        break;
                    case 13:
                        vo.closeTypeName = "远程定时关阀";
                        break;
                    case 14:
                        vo.closeTypeName = "远程定量关阀";
                        break;
                    default:
                        vo.closeTypeName = "未知关阀类型";
                if (vo.closeType != null) {
                    switch (vo.closeType) {
                        case 2:
                            vo.closeTypeName = "刷卡关阀";
                            break;
                        case 4:
                            vo.closeTypeName = "中心站关阀";
                            break;
                        case 5:
                            vo.closeTypeName = "欠费关阀";
                            break;
                        case 6:
                            vo.closeTypeName = "流量计故障关阀";
                            break;
                        case 7:
                            vo.closeTypeName = "紧急关阀";
                            break;
                        case 9:
                            vo.closeTypeName = "用户远程关阀";
                            break;
                        case 10:
                            vo.closeTypeName = "巡检卡关阀";
                            break;
                        case 12:
                            vo.closeTypeName = "黑名单命令关阀";
                            break;
                        case 13:
                            vo.closeTypeName = "远程定时关阀";
                            break;
                        case 14:
                            vo.closeTypeName = "远程定量关阀";
                            break;
                        default:
                            vo.closeTypeName = "未知关阀类型";
                    }
                }else{
                    vo.closeTypeName = "未知关阀类型";
                }
            }
        }
@@ -684,40 +673,4 @@
        return rsVo ;
    }

    /**
     * 最近未报数的取水口
     * @param qo
     * @return
     */
    public QueryResultVo<List<VoIntakeUnReported>> getUnReportedIntakes(CommonQO qo) {
        String timeStart = qo.getTimeStart();
        String timeStop = qo.getTimeStop();
        if(timeStart == "") {
            timeStart = null;
        }
        if(timeStop == "") {
            timeStop = null;
        }
        if(timeStart != null && timeStart != "") {
            timeStart = timeStart + " 00:00:00";
        }
        qo.setTimeStart(timeStart);

        if(timeStop != null && timeStop != "") {
            timeStop = timeStop + " 23:59:59";
        }
        qo.setTimeStop(timeStop);


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

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

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