指定时间为上线的取水口 修改传参限制 获取指定信号强度的取水口 修改传参限制 根据开阀类型获取操作次数 修改传参限制

wuzeyu

2024-08-27 365f1ff8f0275f9e1d4b60c444ef3387149a47ce

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

        Integer openType = qo.getOpenType();
        String openTypeName = "";
        if (openType == null){
            openTypeName = "未知";
        }else {
        switch (openType) {
            case 1:
                openTypeName = "刷卡开阀";
@@ -339,6 +347,9 @@
            case 13:
                openTypeName = "开关阀卡开阀";
                break;
                default:
                    openTypeName = "未知";
            }
        }

        // 生成查询参数