Merge remote-tracking branch 'origin/develop1.0' into develop_alioo

ali

2025-01-20 34a007951daf79f8d549ceb811d7fa9ed3fab6fd

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

@@ -25,17 +25,13 @@

    @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) {
@@ -47,8 +43,6 @@

    /**
     * @description: 能耗趋势
     * @param timeType
     * @return
     * @author: hmj
     * @date: 2024/10/8 13:41
     */
@@ -67,8 +61,6 @@

    /**
     * @description: 科室能耗排名
     * @param timeType
     * @return
     * @author: hmj
     * @date: 2024/10/8 13:41
     */
@@ -86,15 +78,12 @@

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