add SystemMonitor

src/main/java/org/bench4q/monitor/api/ProcessController.java

@@ -10,13 +10,15 @@ import org.springframework.web.bind.annotation.ResponseBody;
 
 @Controller
 @RequestMapping("/Monitor")
-public class ProcessController  extends MonitorContorlEntity {
+public class ProcessController extends MonitorContorlEntity {
 
 	public ProcessServiceWindows getProcessServiceWindows() {
 		return processServiceWindows;
 	}
+
 	@Autowired
-	public void setProcessServiceWindows(ProcessServiceWindows processServiceWindows) {
+	public void setProcessServiceWindows(
+			ProcessServiceWindows processServiceWindows) {
 		this.processServiceWindows = processServiceWindows;
 	}
 
@@ -24,12 +26,14 @@ public class ProcessController  extends MonitorContorlEntity {
 
 	@RequestMapping("/Process")
 	@ResponseBody
-	public ProcessModel getProcessInfo(){
+	public ProcessModel getProcessInfo() {
 
-		if(this.getOsNameString().contains("windows")){
-			return this.getProcessServiceWindows().getProcessInfo(this.getIdleTime());
+		if (this.getOsNameString().contains("windows")) {
+			
+			return this.getProcessServiceWindows().getProcessInfo(
+					this.getIdleTime());
 		}
-		else return null;	
+	else return null;
 	}
 
 }

src/main/java/org/bench4q/monitor/api/SystemController.java

@@ -0,0 +1,23 @@
+package org.bench4q.monitor.api;
+
+import org.bench4q.monitor.entiry.MonitorContorlEntity;
+import org.bench4q.monitor.model.SystemModel;
+import org.bench4q.monitor.service.windows.SystemServiceWindows;
+import org.springframework.stereotype.Controller;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.ResponseBody;
+@Controller
+@RequestMapping("/Monitor")
+public class SystemController extends MonitorContorlEntity{
+	@ResponseBody
+	@RequestMapping("/System")
+	public SystemModel getSystemInfo(){
+		if(this.getOsNameString().contains("windows")){
+			SystemServiceWindows systemServiceWindows=new SystemServiceWindows();
+			return systemServiceWindows.getSystemInfo(this.getIdleTime());
+		}
+		else return null;
+		}
+	}
+
+

src/main/java/org/bench4q/monitor/entiry/MonitorContorlEntity.java

@@ -9,7 +9,7 @@ public class MonitorContorlEntity {
 		private int idleTime;
 		public MonitorContorlEntity(){
 			this.osNameString=System.getProperty("os.name").toLowerCase();
-			this.idleTime=100;
+			this.idleTime=1000;
 		}
 		public String getOsNameString() {
 			return osNameString;

src/main/java/org/bench4q/monitor/model/NetworkInterfaceModelChild.java

@@ -1,5 +1,8 @@
 package org.bench4q.monitor.model;
 
+import javax.xml.bind.annotation.XmlRootElement;
+
+@XmlRootElement
 public class NetworkInterfaceModelChild {
 private double bytesTotalPerSecond;
 private String instance;

src/main/java/org/bench4q/monitor/model/PhysicalDiskModel.java

@@ -1,11 +1,13 @@
 package org.bench4q.monitor.model;
 
+
 import java.util.ArrayList;
 import java.util.List;
 
 import javax.xml.bind.annotation.XmlElement;
 import javax.xml.bind.annotation.XmlElementWrapper;
-
+import javax.xml.bind.annotation.XmlRootElement;
+@XmlRootElement(name="PhisicalDisk")
 public class PhysicalDiskModel {
 	private List<PhysicalDiskModelChild>   physicalDiskModelList;
 	  @XmlElementWrapper 

src/main/java/org/bench4q/monitor/model/PhysicalDiskModelChild.java

@@ -1,5 +1,8 @@
 package org.bench4q.monitor.model;
 
+import javax.xml.bind.annotation.XmlRootElement;
+
+@XmlRootElement
 public class PhysicalDiskModelChild {
 
 	private String instance;

src/main/java/org/bench4q/monitor/model/ProcessModel.java

@@ -13,7 +13,7 @@ public class ProcessModel {
 	
 	private List<ProcessModelChild>   procesModelList;
 	  @XmlElementWrapper 
-      @XmlElement(name="Instance",type=ProcessorModelChild.class)
+      @XmlElement(name="Instance",type=ProcessModelChild.class)
 	public List<ProcessModelChild> getProcesModelList() {
 		return procesModelList;
 	}
@@ -26,7 +26,4 @@ public class ProcessModel {
 	
   
 	
-
-	
-	
 }

src/main/java/org/bench4q/monitor/model/ProcessModelChild.java

@@ -1,5 +1,8 @@
 package org.bench4q.monitor.model;
 
+import javax.xml.bind.annotation.XmlRootElement;
+
+@XmlRootElement
 public class ProcessModelChild {
 	private String instanceString;
 	private double privateBytes;

src/main/java/org/bench4q/monitor/model/ProcessorModel.java

@@ -6,7 +6,7 @@ import javax.xml.bind.annotation.XmlElement;
 import javax.xml.bind.annotation.XmlElementWrapper;
 import javax.xml.bind.annotation.XmlRootElement;
 
-@XmlRootElement
+@XmlRootElement(name="Processor")
 public class ProcessorModel {
 	private  List<ProcessorModelChild> processorModelList;
 	 public ProcessorModel(){

src/main/java/org/bench4q/monitor/model/SystemModel.java

@@ -0,0 +1,37 @@
+package org.bench4q.monitor.model;
+
+public class SystemModel {
+
+	private double fileDataOperationsPerSecond;
+
+	public double getFileDataOperationsPerSecond() {
+		return fileDataOperationsPerSecond;
+	}
+
+	public void setFileDataOperationsPerSecond(double fileDataOperationsPerSecond) {
+		this.fileDataOperationsPerSecond = fileDataOperationsPerSecond;
+	}
+
+	public double getProcessorQueueLength() {
+		return processorQueueLength;
+	}
+
+	public void setProcessorQueueLength(double processorQueueLength) {
+		this.processorQueueLength = processorQueueLength;
+	}
+
+	private  double totalProceesorTimePercent;
+
+	public double getTotalProceesorTimePercent() {
+		return totalProceesorTimePercent;
+	}
+
+	
+	private double processorQueueLength;
+
+	public void setTotalProceesorTimePercent(double totalProceesorTimePercent2) {
+		// TODO Auto-generated method stub
+		this.totalProceesorTimePercent = totalProceesorTimePercent;
+	}
+
+}

src/main/java/org/bench4q/monitor/service/windows/PhysicalDiskServiceWindows.java

@@ -23,8 +23,10 @@ public class PhysicalDiskServiceWindows {
 
 		PhysicalDiskModel physicalDiskModel = new PhysicalDiskModel();
 		String instances[] = physicalDiskMonitor.getInstances();
+		System.out.println(instances.length);
 		PhysicalDiskModelChild physicalDiskModelChild = new PhysicalDiskModelChild();
 		for (String elem : instances) {
+			physicalDiskModelChild.setInstance(elem);
 			physicalDiskModelChild
 					.setAverageDiskQueueLength(physicalDiskMonitor
 							.getAverageDiskQueueLength(elem, idleTime));

src/main/java/org/bench4q/monitor/service/windows/ProcessServiceWindows.java

@@ -35,9 +35,7 @@ public class ProcessServiceWindows {
 			processModelChild.setPrivateBytes(this.getProcessMonitor().getPrivateBytes(elem));
 			processModelChild.setWorkingSet(this.getProcessMonitor().getWorkingSet(elem));
 			processModel.getProcesModelList().add(processModelChild);
-			
 		}
-	
 		return processModel;
 		
 	}

src/main/java/org/bench4q/monitor/service/windows/ProcessorServiceWindows.java

@@ -5,8 +5,12 @@ import org.bench4q.monitor.performance.windows.ProcessorMonitor;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
-@Service
+
 public class ProcessorServiceWindows {
+	public ProcessorServiceWindows() {
+		// TODO Auto-generated constructor stub
+		this.processorMonitor=new ProcessorMonitor();
+	}
 	private ProcessorMonitor processorMonitor;
 
 	public ProcessorMonitor getProcessorMonitor() {

src/main/java/org/bench4q/monitor/service/windows/SystemServiceWindows.java

@@ -0,0 +1,36 @@
+package org.bench4q.monitor.service.windows;
+
+import org.bench4q.monitor.model.SystemModel;
+import org.bench4q.monitor.performance.windows.ProcessorMonitor;
+import org.bench4q.monitor.performance.windows.SystemMonitor;
+
+public class SystemServiceWindows {
+	
+	public SystemServiceWindows(){
+		this.systemMonitor=new SystemMonitor();
+		this.processorMonitor=new ProcessorMonitor();
+	}
+	private SystemMonitor systemMonitor;
+	private ProcessorMonitor processorMonitor;
+	public SystemMonitor getSystemMonitor() {
+		return systemMonitor;
+	}
+	public void setSystemMonitor(SystemMonitor systemMonitor) {
+		this.systemMonitor = systemMonitor;
+	}
+	public ProcessorMonitor getProcessorMonitor() {
+		return processorMonitor;
+	}
+	public void setProcessorMonitor(ProcessorMonitor processorMonitor) {
+		this.processorMonitor = processorMonitor;
+	}
+	
+	public SystemModel getSystemInfo(int idleTime){
+		SystemModel systemModel=new SystemModel();
+		systemModel.setFileDataOperationsPerSecond(this.getSystemMonitor().getFileDataOperationsPerSecond(idleTime));
+		systemModel.setProcessorQueueLength(this.getSystemMonitor().getProcessorQueueLength());
+		double totalProceesorTimePercent=this.getProcessorMonitor().getProcessorTimePercent("_Total", idleTime);
+		systemModel.setTotalProceesorTimePercent(totalProceesorTimePercent);
+		return systemModel;
+	}
+}