1、监视升级过程RTU集合以地址排序； 2、实现升级结果查询与导出。

liurunyu

2024-11-28 3e82bb3f97e95c90099070787da4455e64b95b3f

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

@@ -64,13 +64,16 @@
         */
        String timeStart = qo.getTimeStart();
        String timeStop = qo.getTimeStop();
        if(timeStart != null) {
            timeStart = timeStart + " 00:00:00";
        }else {
            timeStart = LocalDate.now() + " 00:00:00";
        }

        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);
@@ -306,39 +309,47 @@
     */
    public VoCountOfOpenType getCountByOpenType(OpenTypeQO qo) {
        /**
         * 补齐起止时间，如果开始时间为空，则默认为当前日期
         * 补齐起止时间，如果开始时间为空，则默认为当前日期，如果结束时间为空，则查询时间为空
         */
        String timeStart = qo.getTimeStart();
        String timeStop = qo.getTimeStop();
        if(timeStart != null) {
            timeStart = timeStart + " 00:00:00";
        }else {
            timeStart = LocalDate.now() + " 00:00:00";
        }
        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);

        Integer openType = qo.getOpenType();
        String openTypeName = "";
        switch (openType) {
            case 1:
                openTypeName = "刷卡开阀";
                break;
            case 3:
                openTypeName = "中心站开阀";
                break;
            case 8:
                openTypeName = "用户远程开阀";
                break;
            case 11:
                openTypeName = "开关阀卡开阀";
                break;
            case 13:
                openTypeName = "开关阀卡开阀";
                break;
        if (openType == null){
            openTypeName = "不知道您要查那种开阀类型";
        }else {
            switch (openType) {
                case 1:
                    openTypeName = "刷卡开阀";
                    break;
                case 3:
                    openTypeName = "中心站开阀";
                    break;
                case 8:
                    openTypeName = "用户远程开阀";
                    break;
                case 11:
                    openTypeName = "巡检卡开阀";
                    break;
                case 13:
                    openTypeName = "巡检卡开阀";
                    break;
                default:
                    openTypeName = "不知道您要查那种开阀类型";
            }
        }

        // 生成查询参数
@@ -363,52 +374,59 @@
         */
        String timeStart = qo.getTimeStart();
        String timeStop = qo.getTimeStop();
        if(timeStart != null) {
            timeStart = timeStart + " 00:00:00";
        }else {
            timeStart = LocalDate.now() + " 00:00:00";
        }
        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);

        Integer closeType = qo.getCloseType();
        String closeTypeName = "";
        switch (closeType) {
            case 2:
                closeTypeName = "刷卡关阀";
                break;
            case 4:
                closeTypeName = "中心站关阀";
                break;
            case 5:
                closeTypeName = "欠费关阀";
                break;
            case 6:
                closeTypeName = "流量计故障关阀";
                break;
            case 7:
                closeTypeName = "紧急关阀";
                break;
            case 9:
                closeTypeName = "用户远程关阀";
                break;
            case 10:
                closeTypeName = "开关阀卡关阀";
                break;
            case 12:
                closeTypeName = "黑名单命令关阀";
                break;
            case 13:
                closeTypeName = "远程定时关阀";
                break;
            case 14:
                closeTypeName = "远程定量关阀";
                break;
        if (closeType == null){
            closeTypeName = "不知道您要查那种关阀类型";
        }else {
            switch (closeType) {
                case 2:
                    closeTypeName = "刷卡关阀";
                    break;
                case 4:
                    closeTypeName = "中心站关阀";
                    break;
                case 5:
                    closeTypeName = "欠费关阀";
                    break;
                case 6:
                    closeTypeName = "流量计故障关阀";
                    break;
                case 7:
                    closeTypeName = "紧急关阀";
                    break;
                case 9:
                    closeTypeName = "用户远程关阀";
                    break;
                case 10:
                    closeTypeName = "巡检卡关阀";
                    break;
                case 12:
                    closeTypeName = "黑名单命令关阀";
                    break;
                case 13:
                    closeTypeName = "远程定时关阀";
                    break;
                case 14:
                    closeTypeName = "远程定量关阀";
                    break;
                default:
                    closeTypeName = "不知道您要查那种关阀类型";
            }
        }

        // 生成查询参数
        Map<String, Object> params = (Map<String, Object>) PojoUtils.generalize(qo) ;
        Integer closeTypeCount = Optional.ofNullable(rmOpenCloseValveLastMapper.getCountByCloseType(params)).orElse(0);
@@ -753,4 +771,41 @@
        rsVo.obj = rmLossDayLastMapper.getMonthLossAmount(params);
        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 ;
    }
}