Merge pull request #51 from zhitan-cloud/develop1.0

ustcyc

2025-04-10 4d97c9648d473fd091675e19dee44880ccaefea8

Merge pull request #51 from zhitan-cloud/develop1.0

Develop1.0

 zhitan-system/src/main/java/com/zhitan/home/service/HomePageServiceImpl.java

@@ -76,7 +76,7 @@
            final Double tongbiCount = tongbiMap.get(energyNo).stream().map(HomeEnergyStatisticsVO::getCount).mapToDouble(Double::doubleValue).sum();
            final Double huanbiCount = huanbiMap.get(energyNo).stream().map(HomeEnergyStatisticsVO::getCount).mapToDouble(Double::doubleValue).sum();

            vo.setTonCount(format2Double(vo.getCount() * Double.valueOf(vo.getCoefficient())));
            vo.setTonCount(format2Double(count));
            if (tongbiCount != 0) {
                vo.setTongbi(format2Double((count - tongbiCount) / tongbiCount * 100));
            } else {

 zhitan-system/src/main/java/com/zhitan/statisticalAnalysis/domain/dto/FlowChartsDTO.java

@@ -55,6 +55,15 @@
        if (ObjectUtils.isEmpty(timeType)) {
            return TimeType.DAY;
        }
        return timeType;
        switch (timeType) {
            case DAY:
                return TimeType.HOUR;
            case MONTH:
                return TimeType.DAY;
            case YEAR:
                return TimeType.MONTH;
            default:
                return timeType;
        }
    }
}