测试

DYL

2025-01-17 fd07b985eee589cc66fb0bea127b982842378320

 zhitan-admin/src/main/java/com/zhitan/web/controller/homepage/HomePageController.java

@@ -25,17 +25,14 @@

    @Autowired
    public IHomePageService homepageService;

   /**
    * @description: 全厂能耗统计
    * @param timeType
    * @return 
    * @author: hmj
    * @date: 2024/10/8 13:41
    * @description:  全厂能耗统计
    */
   @GetMapping("/energyConsumptionSummation")
   public AjaxResult energyConsumptionSummation(String timeType) {
       try {
           String modelcode = "Composite_Indicators";
           String modelcode = "COMPREHENSIVE_CODE";
           return AjaxResult.success(homepageService.energyConsumptionSummation(timeType,modelcode));
       } catch (Exception ex) {
           logger.error("获取出错！", ex);
@@ -46,15 +43,13 @@

    /**
     * @description: 能耗趋势
     * @param timeType
     * @return
     * @author: hmj
     * @date: 2024/10/8 13:41
     */
    @GetMapping("/energyConsumptionTrend")
    public AjaxResult energyConsumptionTrend(String timeType) {
        try {
            String modelcode = "Composite_Indicators";
            String modelcode = "COMPREHENSIVE_CODE";
            HomeEnergyConsumptionTrendVO vo = homepageService.energyConsumptionTrend(timeType,modelcode);

            return AjaxResult.success(vo);
@@ -66,15 +61,13 @@

    /**
     * @description: 科室能耗排名
     * @param timeType
     * @return
     * @author: hmj
     * @date: 2024/10/8 13:41
     */
    @GetMapping("/energyConsumptionRanking")
    public AjaxResult energyConsumptionRanking(String timeType) {
        try {
            String modelcode = "Composite_Indicators";
            String modelcode = "COMPREHENSIVE_CODE";
            List<RankingEnergyData> consumptionAnalysisVO = homepageService.energyConsumptionRanking(modelcode,timeType);
            return AjaxResult.success(consumptionAnalysisVO);
        } catch (Exception ex) {
@@ -85,8 +78,6 @@

    /**
     * @description: 峰平谷占比
     * @param timeType
     * @return
     * @author: hmj
     * @date: 2024/10/8 13:41
     */
@@ -94,7 +85,7 @@
    public AjaxResult peakValley(String timeType) {
        try {
//            String modelcode = "Composite_Indicators";
            String modelcode = "PEAK_VALLEY";
            String modelcode = "COMPREHENSIVE_CODE";
            List<HomePeakValleyVO> vo = homepageService.peakValley(timeType,modelcode);
            return AjaxResult.success(vo);
        } catch (Exception ex) {