iailab-module-data/iailab-module-data-biz/src/main/java/com/iailab/module/data/ind/collection/utils/IndSqlUtils.java

@@ -341,16 +341,37 @@
        selectSql.append(" data_time");
        result.setSelectSql(selectSql.toString());

        // 根据时间粒度确定 时间格式
        String datePattern = PATTERN_MIN;
        if (StringUtils.isNotBlank(itemEntity.getTimeGranularity())) {
            switch (TimeGranularityEnum.getEumByCode(itemEntity.getTimeGranularity())){
                case TG_MIN:
                    datePattern = PATTERN_MIN;
                    break;
                case TG_HOUR:
                    datePattern = PATTERN_HOUR;
                    break;
                case TG_DAY:
                    datePattern = PATTERN_DAY;
                    break;
                case TG_MON:
                    datePattern = PATTERN_MON;
                    break;
                default:
                    datePattern = PATTERN_YEAR;
            }
        }

        // 拼接WHERE
        StringBuilder whereSql = new StringBuilder();
        whereSql.append(" ");
        whereSql.append(indItem.getTimeLabel());
        whereSql.append(" <= '");
        whereSql.append(DateUtils.format(endTime, DateUtils.FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND));
        whereSql.append(DateUtils.format(endTime, datePattern));
        whereSql.append("' AND ");
        whereSql.append(indItem.getTimeLabel());
        whereSql.append(" >= '");
        whereSql.append(DateUtils.format(startTime, DateUtils.FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND));
        whereSql.append(DateUtils.format(startTime, datePattern));
        whereSql.append("'");
        result.setWhereSql(whereSql.toString());