kangwei ：

@@ -278,17 +278,20 @@ public class FCustomReportDatasetServiceImpl extends ServiceImpl<FCustomReportDa
 
 	//节能环保  大屏展示
 	public JnhbLargeScreenVO jnhbLargeScreenShow(DataVO dataVO){
+		long startTime = System.nanoTime();
 		JnhbLargeScreenVO  largeScreenVO = new  JnhbLargeScreenVO();
 		//当月数据
 		String dataViewName2 = ReportViewUtil.buildView("2119ecbf53a1d2d0708258ff67cfd9e1","CSL", null, dataVO.getNowStartTime(), dataVO.getNowEndTime());
 		String dataViewName3 = ReportViewUtil.buildView("3a243d5715b9e1a3753c180872ca0df9","DLHJ,GFFDL,QY,YSL,WNL,WNHSL,GFCZL,WFCSL,WFCZL", null, dataVO.getNowStartTime(), dataVO.getNowEndTime());
 		List<JnhbReportData> jnhbReportDataList = mapper.getJnhbReport(dataViewName2, dataViewName3, dataVO.getNowStartTime(), dataVO.getNowEndTime(), null);
+		//System.out.println("1111---**************执行时间："+ (System.nanoTime() - startTime) / 1_000_000.0 + " milliseconds");
 
 		// 上月数据  同比
 		dataViewName2 = ReportViewUtil.buildView("2119ecbf53a1d2d0708258ff67cfd9e1","CSL", null, dataVO.getLastMonthStartTime(), dataVO.getLastMonthEndTime());
 		dataViewName3 = ReportViewUtil.buildView("3a243d5715b9e1a3753c180872ca0df9","DLHJ,GFFDL,QY,YSL,WNL,WNHSL,GFCZL,WFCSL,WFCZL", null, dataVO.getLastMonthStartTime(), dataVO.getLastMonthEndTime());
 		List<JnhbReportData> lastMonthReportDataList = mapper.getJnhbReport(dataViewName2, dataViewName3, dataVO.getLastMonthStartTime(), dataVO.getLastMonthEndTime(), null);
 
+		//System.out.println("2222---**************执行时间："+ (System.nanoTime() - startTime) / 1_000_000.0 + " milliseconds");
 		Map<String,JnhbReportData>  lastMonthMapData=  convertJnhbReportDataMap(lastMonthReportDataList);
 		// 去年数据 环比
 		dataViewName2 = ReportViewUtil.buildView("2119ecbf53a1d2d0708258ff67cfd9e1","CSL", null, dataVO.getLastYearStartTime(), dataVO.getLastYearEndTime());
@@ -296,6 +299,7 @@ public class FCustomReportDatasetServiceImpl extends ServiceImpl<FCustomReportDa
 		List<JnhbReportData> lastYearReportDataList = mapper.getJnhbReport(dataViewName2, dataViewName3, dataVO.getLastYearStartTime(), dataVO.getLastYearEndTime(), null);
 		Map<String,JnhbReportData>  lastYearMapData=  convertJnhbReportDataMap(lastYearReportDataList);
 
+		//System.out.println("333333---**************执行时间："+ (System.nanoTime() - startTime) / 1_000_000.0 + " milliseconds");
 		LoadRateVO loadRateVO = null;
 		PowerConsumeVO powerConsumeVO = null;
 		ResultNumberVO  c02NumberVO = null;//CO2排放对象
@@ -375,41 +379,41 @@ public class FCustomReportDatasetServiceImpl extends ServiceImpl<FCustomReportDa
 			// String ybgfcsl, String ybgfczl, String jgwnl, String wfcsl, String wfczl
 			largeScreenVO.getWasteMaterialList().add( new WasteMaterialVO( reportData.getDepartId(),reportData.getDepartName(),reportData.getYbgfcsl(),reportData.getYbgfczl(),reportData.getJgwnl(),reportData.getWfcsl(),reportData.getWfczl()  ) ) ;
 		}
-
+		//System.out.println("44444444---**************执行时间："+ (System.nanoTime() - startTime) / 1_000_000.0 + " milliseconds");
 		//主库数据源
 		JdbcTemplate masterDB = (JdbcTemplate) SpringContextUtils.getBean("master");
 		int count1 = masterDB.queryForObject("select count(1) from equipment_info where energy_level = 1",Integer.class);
 		largeScreenVO.setEquipmentL1( count1 );
-
+		//System.out.println("55555---**************执行时间："+ (System.nanoTime() - startTime) / 1_000_000.0 + " milliseconds");
 		int count2 = masterDB.queryForObject("select count(1) from equipment_info where energy_level = 2",Integer.class);
 		largeScreenVO.setEquipmentL2( count2 );
-
+		//System.out.println("666666---**************执行时间："+ (System.nanoTime() - startTime) / 1_000_000.0 + " milliseconds");
 		// 各站点系统负荷率排名：负荷率排序、设置排名
-		if(largeScreenVO.getLoadRateVOList() != null && !largeScreenVO.getLoadRateVOList().isEmpty()){
+	/*	if(largeScreenVO.getLoadRateVOList() != null && !largeScreenVO.getLoadRateVOList().isEmpty()){
 			// 根据分数排序
 			Collections.sort(largeScreenVO.getLoadRateVOList(), new Comparator<LoadRateVO>() {
 				public int compare(LoadRateVO s1, LoadRateVO s2) {
 					return Double.compare(ConvertUtils.getDouble(s1.getWsfhl(),0d), ConvertUtils.getDouble(s1.getWsfhl(),0d)); // 降序排序
 				}
 			});
-			/*int rank = 1;	// 设置排名
+			*//*int rank = 1;	// 设置排名
 			for( LoadRateVO  loadRateVORank: largeScreenVO.getLoadRateVOList()){
 				loadRateVORank.setRank(  rank++);
+			}*//*
 		}*/
-		}
 //各站点能源消耗排名 吨水电耗
-		if(largeScreenVO.getPowerConsumeVOList() != null && !largeScreenVO.getPowerConsumeVOList().isEmpty()) {
+		/*if(largeScreenVO.getPowerConsumeVOList() != null && !largeScreenVO.getPowerConsumeVOList().isEmpty()) {
 			// 根据分数排序
 			Collections.sort(largeScreenVO.getPowerConsumeVOList(), new Comparator<PowerConsumeVO>() {
 				public int compare(PowerConsumeVO s1, PowerConsumeVO s2) {
 					return Double.compare(ConvertUtils.getDouble(s1.getDh(), 0d), ConvertUtils.getDouble(s1.getDh(), 0d)); // 降序排序
 				}
 			});
-			/*int rank = 1;	// 设置排名
+			*//*int rank = 1;	// 设置排名
 			for( LoadRateVO  loadRateVORank: largeScreenVO.getLoadRateVOList()){
 				loadRateVORank.setRank(  rank++);
+			}*//*
 		}*/
-		}
 
 
 		return largeScreenVO;