Index: ssts-reports/src/main/java/com/forgon/disinfectsystem/jasperreports/action/JasperreportsAction.java
===================================================================
diff -u -r38595 -r38631
--- ssts-reports/src/main/java/com/forgon/disinfectsystem/jasperreports/action/JasperreportsAction.java	(.../JasperreportsAction.java)	(revision 38595)
+++ ssts-reports/src/main/java/com/forgon/disinfectsystem/jasperreports/action/JasperreportsAction.java	(.../JasperreportsAction.java)	(revision 38631)
@@ -111,6 +111,7 @@
 import com.forgon.disinfectsystem.jasperreports.util.MonthReportHelper;
 import com.forgon.disinfectsystem.jasperreports.util.OperationTousseOperationRepartHelper;
 import com.forgon.disinfectsystem.jasperreports.util.PackingFailureRateReportChartHelper;
+import com.forgon.disinfectsystem.jasperreports.util.RealTimeBulletinBoardWorkloadHelper;
 import com.forgon.disinfectsystem.jasperreports.util.SterilizationFailureRateReportChartHelper;
 import com.forgon.disinfectsystem.jasperreports.util.TousseDeliverStatisticsHelper;
 import com.forgon.disinfectsystem.jasperreports.util.TousseTournoverDaysStatisticsReportHelper;
@@ -165,6 +166,11 @@
 	
 	private CustomReportsOfXjjqzyy customReportsOfXjjqzyy;
 	
+	private RealTimeBulletinBoardWorkloadHelper realTimeBulletinBoardWorkloadHelper;
+	public void setRealTimeBulletinBoardWorkloadHelper(
+			RealTimeBulletinBoardWorkloadHelper realTimeBulletinBoardWorkloadHelper) {
+		this.realTimeBulletinBoardWorkloadHelper = realTimeBulletinBoardWorkloadHelper;
+	}
 	private CustomReports customReports;
 	private BrancheOfHospitalManager brancheOfHospitalManager;
 	private OnlineUserManager onlineUserManager;
@@ -4695,7 +4701,7 @@
 	public void getRealTimeBulletinBoardWorkloadData(){
 		JSONObject obj = new JSONObject();
 		try {
-			JSONObject data = jasperReportManager.getRealTimeBulletinBoardWorkloadData();
+			JSONObject data = realTimeBulletinBoardWorkloadHelper.getRealTimeBulletinBoardWorkloadData();
 			obj.put("data", data);
 		} catch (Exception e) {
 			e.printStackTrace();
@@ -4704,20 +4710,6 @@
 		}
 	}
 	/**
-	 * 获取设备使用情况
-	 */
-	public void getEquipmentData(){
-		JSONObject obj = new JSONObject();
-		try {
-			List<JSONObject> data = jasperReportManager.getEquipmentData();
-			obj.put("data", data);
-		} catch (Exception e) {
-			e.printStackTrace();
-		}finally{
-			StrutsResponseUtils.output(obj);
-		}
-	}
-	/**
 	 * 获取一级供应室的在线用户数量
 	 */
 	public void getFirstSupplyRoomConfigOnlineUserDate(){
@@ -4873,5 +4865,17 @@
 			}
 		}
 	}
+	/**
+	 * 获取数据源获取数据 主要用于数据看板
+	 */
+	public void getDataByDataSources(){
+		try {
+			Map<String,String> parameters = StrutsParamUtils.getParameters();
+			StrutsResponseUtils.output(true, realTimeBulletinBoardWorkloadHelper.getDataByDataSources(parameters));
+		} catch (Exception e) {
+			e.printStackTrace();
+			StrutsResponseUtils.output(false, e.getMessage());
+		}
+	}
 	
 }