环境监测实时数据图表修改调整

WebRoot/general/admin/allcount.jsp

 <script type="text/javascript" charset="utf-8">
-window.location.href="http://192.168.1.3:8081/MineJSON/allcount.jsp"
+window.location.href="http://192.168.1.11:8081/MineJSON/allcount.jsp"
 
 
 //    window.location.href="http://192.168.1.8:8082/MineJSON/allcount.jsp"

WebRoot/general/admin/attendance.jsp

@@ -156,7 +156,7 @@
 								//		+ timeSe, null, function(obj) {
 								$
 										.getJSON(
-												'http://192.168.1.3:8081/MineJSON/vzigbee.action?type=8&param='
+												'http://192.168.1.11:8081/MineJSON/vzigbee.action?type=8&param='
 														+ rowData.personcode
 														+ '-'
 														+ (Date.parse(new Date(

WebRoot/general/admin/co2jiance.jsp

 <script type="text/javascript" charset="utf-8">
-window.location.href="http://192.168.1.3:8081/MineEM/tubiao/co2jiance.jsp"
+window.location.href="http://192.168.1.11:8081/MineEM/tubiao/co2jiance.jsp"
 </script>

WebRoot/general/admin/cojiance.jsp

 <script type="text/javascript" charset="utf-8">
-window.location.href="http://192.168.1.3:8081/MineEM/tubiao/cojiance.jsp"
+window.location.href="http://192.168.1.11:8081/MineEM/tubiao/cojiance.jsp"
 </script>

WebRoot/general/admin/fengsu.jsp

 <script type="text/javascript" charset="utf-8">
-window.location.href="http://192.168.1.3:8081/MineEM/tubiao/fengsu.jsp"
+window.location.href="http://192.168.1.11:8081/MineEM/tubiao/fengsu.jsp"
 //window.location.href="http://localhost:8080/MineTRS/tubiao/fengsu.jsp"
 </script>

WebRoot/general/admin/fengya.jsp

 <script type="text/javascript" charset="utf-8">
-window.location.href="http://192.168.1.3:8081/MineEM/tubiao/fengya.jsp"
+window.location.href="http://192.168.1.11:8081/MineEM/tubiao/fengya.jsp"
 //window.location.href="http://localhost:8080/MineTRS/tubiao/fengya.jsp"
 </script>

WebRoot/general/admin/no2jiance.jsp

 <script type="text/javascript" charset="utf-8">
-window.location.href="http://192.168.1.3:8081/MineEM/tubiao/no2jiance.jsp"
+window.location.href="http://192.168.1.11:8081/MineEM/tubiao/no2jiance.jsp"
 </script>

WebRoot/general/admin/o2jiance.jsp

 <script type="text/javascript" charset="utf-8">
-window.location.href="http://192.168.1.3:8081/MineEM/tubiao/o2jiance.jsp"
+window.location.href="http://192.168.1.11:8081/MineEM/tubiao/o2jiance.jsp"
 </script>

WebRoot/tubiao/co2jiance.jsp

@@ -275,7 +275,7 @@
                             });
                             arrss.push({x: 0, y: value1});
                             arrss.push({x: 23, y: value1});
-                            var ifbj = parseFloat(value.ifbj.toString());
+                            var ifbj = parseFloat(value.ifbj);
                             var ifguzhang = parseFloat(value.ifguzhang.toString());
                             var color = '#204120';
                             if (ifbj == "1") color = "#EA0000";

WebRoot/tubiao/cojiance.jsp

@@ -41,7 +41,7 @@
 
         setInterval('myrefresh()', 600000);
 
-        function initpolygon1(polygon, cgqName, color, sensorname) {
+        function initpolygon1(polygon, cgqName, color, sensorname, devicename) {
             var chart ;
             Highcharts.setOptions({
                 colors: ['#0A75A3', '#FF0000', '#00FF00']
@@ -112,7 +112,7 @@
                 tooltip: {
                     formatter: function () {
                         return '' +
-                            this.series.name + ': ' + this.y.toFixed(3) + '毫克/立方米';
+                            devicename + ': ' + this.y.toFixed(3) + '毫克/立方米';
                     }
                 },
                 credits: {
@@ -276,7 +276,7 @@
                             });
                             arrss.push({x: 0, y: value1});
                             arrss.push({x: 23, y: value1});
-                            var ifbj = parseFloat(value.ifbj.toString());
+                            var ifbj = parseFloat(value.ifbj);
                             var ifguzhang = parseFloat(value.ifguzhang.toString());
                             var color = '#204120';
                             if (ifbj == "1") color = "#EA0000";
@@ -285,7 +285,7 @@
                                     color = "#cccccc";
                                 }
                             };
-                            initpolygon1("polygon" + (j + 1), value.name , color, value.name);
+                            initpolygon1("polygon" + (j + 1), value.name , color, value.name, value.poumian);
                             shuju(value.name);
                             dayAndMonth(value.name);
                             chartlst[j].addSeries({name: "co", type: 'spline', data: arrs});

WebRoot/tubiao/disscreen.jsp

@@ -107,7 +107,7 @@
         // 页面加载初始化
         $(function() {
             $.ajax({
-                url: "http://192.168.1.3:8080/MineTT/online!EnvironmentRealTimeData.do?token=laowangzhuanyong",
+                url: "http://192.168.1.11:8080/MineTT/online!EnvironmentRealTimeData.do?token=laowangzhuanyong",
                 type: "get",
                 dataType:"jsonp",//请求的数据类型
                 success: function(data) {

WebRoot/tubiao/fengsu.jsp

@@ -417,7 +417,7 @@
                 } ,
                 success : function(date) { //etoak - 服务器返回的响应数据
                     if (date.flag) {
-                        // Dialog.alert("解除成功",function(){window.location.href="http://192.168.1.3:8081/MineEM/tubiao/fengsu.jsp";});
+                        // Dialog.alert("解除成功",function(){window.location.href="http://192.168.1.11:8081/MineEM/tubiao/fengsu.jsp";});
                         //$("#msgbox").hide();
                         // window.location.href="http://192.168.1.8:8081/MineEM/tubiao/fengsu.jsp"
                         $('#polygon1').datagrid('reload');    // 重新加载数据

WebRoot/tubiao/fengya.jsp

@@ -410,7 +410,7 @@
 								success : function(date) { //etoak - 服务器返回的响应数据
 
 									if (date.flag) {
-										Dialog.alert("解除成功",function(){window.location.href="http://192.168.1.3:8081/MineEM/tubiao/fengya.jsp";});
+										Dialog.alert("解除成功",function(){window.location.href="http://192.168.1.11:8081/MineEM/tubiao/fengya.jsp";});
 										//$("#msgbox").hide();
 
 									} else {

WebRoot/tubiao/o2jiance.jsp

@@ -275,7 +275,7 @@
                             });
                             arrss.push({x: 0, y: value1});
                             arrss.push({x: 23, y: value1});
-                            var ifbj = parseFloat(value.ifbj.toString());
+                            var ifbj = parseFloat(value.ifbj);
                             var ifguzhang = parseFloat(value.ifguzhang.toString());
                             var color = '#204120';
                             if (ifbj == "1") color = "#EA0000";

WebRoot/tubiao/shidu.jsp

@@ -410,7 +410,7 @@
 								success : function(date) { //etoak - 服务器返回的响应数据
 
 									if (date.flag) {
-										Dialog.alert("解除成功",function(){window.location.href="http://192.168.1.3:8081/MineEM/tubiao/fengya.jsp";});
+										Dialog.alert("解除成功",function(){window.location.href="http://192.168.1.11:8081/MineEM/tubiao/fengya.jsp";});
 										//$("#msgbox").hide();
 
 									} else {

WebRoot/tubiao/wendu.jsp

@@ -408,7 +408,7 @@
 								success : function(date) { //etoak - 服务器返回的响应数据
 
 									if (date.flag) {
-										Dialog.alert("解除成功",function(){window.location.href="http://192.168.1.3:8081/MineEM/tubiao/fengya.jsp";});
+										Dialog.alert("解除成功",function(){window.location.href="http://192.168.1.11:8081/MineEM/tubiao/fengya.jsp";});
 										//$("#msgbox").hide();
 
 									} else {

src/com/gemho/dao/co2jianceImpl.java

@@ -6,11 +6,7 @@ import java.net.Socket;
 import java.sql.Timestamp;
 import java.text.ParseException;
 import java.text.SimpleDateFormat;
-import java.util.ArrayList;
-import java.util.Calendar;
-import java.util.Date;
-import java.util.List;
-import java.util.Map;
+import java.util.*;
 
 import com.gemho.bean.*;
 import org.hibernate.Query;
@@ -39,7 +35,7 @@ public class co2jianceImpl implements jiangyuliangDao {
 		List listAll = new ArrayList();
 		int id = 0;
 		try {
-			// Person是类的名字而不是表的名字，既然是类的名字就需要严格区分大小写
+			// Person��������ֶ����DZ�����֣���Ȼ��������־���Ҫ�ϸ����ִ�Сд
 			Query query;
 			String a = "FROM TabSensor WHERE mark = '" + mark
 					+ "' order by name";
@@ -80,7 +76,7 @@ public class co2jianceImpl implements jiangyuliangDao {
 					listValue.add(value2);
 				}
 				List guzhanglist = Search_CGQ_new(mark);
-				//检测是否故障
+				//����Ƿ����
 				if(guzhanglist.size()>0){
 				for(int i = 0;i<guzhanglist.size();i++){
 					value valuee = (value)guzhanglist.get(i);
@@ -128,82 +124,57 @@ public class co2jianceImpl implements jiangyuliangDao {
 	public List getCo2(String mark,String state, String zduan) {
 		Session session = HibernateUtil.openSession();
 		Transaction tx = session.beginTransaction();
-		String sql = "";
-		List<Object> list = null;
-		List<Object> liststation = null;
 		List listAll = new ArrayList();
-
 		try {
-			// Person是类的名字而不是表的名字，既然是类的名字就需要严格区分大小写
-			Query query;
-			String a = "FROM TabSensor WHERE  state='"+state+"' order by name";
-			list = session.createQuery(a).list();
-
 			if (zduan.length() == 0) {
 				zduan = "2";
 			}
 			String b = "FROM TabStation WHERE zduan = '" + zduan
 					+ "' and id < 10 order by station";
-
-			liststation = session.createQuery(b).list();
-			for (int i2 = 0; i2 < liststation.size(); i2++) {
-				value value = new value();
-				TabStation station = (TabStation) liststation.get(i2);
-				sql = "select a.jctime,a.value2,a.value3,a.ifbj,a.ifstart from"+
-						" (SELECT to_char(jctime,'yyyy-mm-dd HH24:mm:ss')as jctime,value2,value3,ifbj,ifstart, rank() over (partition by to_char(jctime, 'yyyy-mm-dd HH24') order by to_char(jctime, 'yyyy-mm-dd HH24:mm:ss') desc)" +
-						" FROM tab_eryanghuatan gas where jctime >=(current_date) and ifview=0 and sensorname = '" +station.getStation() + "' order by jctime) as a" +
-						" where a.rank = 1";
-				query = session.createSQLQuery(sql).setResultTransformer(
-						Transformers.ALIAS_TO_ENTITY_MAP);
-				List list1 = (List<Object>) query.list();
-				List listValue = new ArrayList();
-				String alarm = null;
-				int id = 0;
-				for (int j = 0; j < list.size(); j++) {
-					TabSensor TabSensor2 = (TabSensor) list.get(j);
-					alarm = TabSensor2.getAlarmvalue();
-					if (station.getStation().equals(TabSensor2.getNotalarmvalue())) {
-						if (alarm.contains("|")) {
-							String[] alarmvalue = alarm.split("\\|");
-							TabSensor2.setAlarmvalue1(alarmvalue[0]);
-							TabSensor2.setAlarmvalue2(alarmvalue[1]);
-							if (alarmvalue.length > 2) {
-								TabSensor2.setAlarmvalue3(alarmvalue[2]);
+			List<TabStation> liststation = session.createQuery(b).list();
+			listAll = new ArrayList();
+			for (TabStation station: liststation) {
+				String sensorSql = "FROM TabSensor WHERE  state = '"+state+"' and notalarmvalue = '" + station.getStation() + "' order by name";
+				List<TabSensor> list = session.createQuery(sensorSql).list();
+				for (TabSensor sensor: list) {
+					List dataList = new ArrayList();
+					if (sensor.getNotalarmvalue().equals(station.getStation())) {
+						value value = new value();
+						if (sensor.getAlarmvalue().contains("|")) {
+							String[] alarms = sensor.getAlarmvalue().split("\\|");
+							if (alarms.length > 2) {
+								value.setAlarm1(alarms[0]);
+								value.setAlarm1(alarms[1]);
+								value.setAlarm1(alarms[3]);
+							} else {
+								value.setAlarm1(alarms[0]);
+								value.setAlarm1(alarms[1]);
 							}
 						} else {
-							TabSensor2.setAlarmvalue1(alarm);
+							value.setAlarm1(sensor.getAlarmvalue());
 						}
-						value.setAlarm1(TabSensor2.getAlarmvalue1());
-						value.setAlarm2(TabSensor2.getAlarmvalue2());
-						value.setAlarm3(TabSensor2.getAlarmvalue3());
-
-						for (int i = 0; i < list1.size(); i++) {
-							value2 value2 = new value2();
-							Map map = (Map) list1.get(i);
+						String valSql = "select a.jctime,a.value2,a.value3,a.ifbj,a.ifstart from" +
+								" (SELECT to_char(jctime,'yyyy-MM-dd HH24:MI:ss') as jctime,value2,value3,ifbj,ifstart, rank() over (partition by to_char(jctime, 'yyyy-mm-dd HH24') order by to_char(jctime, 'yyyy-MM-dd HH24:MI:ss') desc)" +
+								" FROM tab_eryanghuatan gas where jctime >=(current_date) and ifview=0 and zkname = '" + sensor.getState() + "' and sensorname = '" + station.getStation() + "' order by jctime) as a" +
+								" where a.rank = 1";
+						List<HashMap> valList = (List<HashMap>) session.createSQLQuery(valSql).setResultTransformer(Transformers.ALIAS_TO_ENTITY_MAP).list();
+						for (HashMap map : valList) {
+							value2 v2 = new value2();
 							String jctime = map.get("jctime").toString();
 							String jt = null;
-							if(jctime!=null){
+							if (jctime != null) {
 								jt = jctime.split(" ")[1].split("\\:")[0];
 							}
-							String yvalue1 = map.get("value2").toString();
-							String yvalue2 = map.get("value3").toString();
-							String ifbj = map.get("ifbj").toString();
-							String ifstart = map.get("ifstart").toString();
-							if ("1".equals(ifbj)) {
-								id = 1;
-							}
-
-							if("1".equals(ifstart)){ yvalue1 = null; }
-
-
-							value2.setJctime(jt);
-							value2.setValue(alarm);
-							value2.setValue1(yvalue1);
-							value2.setValue2(yvalue2);
-							listValue.add(value2);
+							v2.setValue(value.getAlarm1());
+							v2.setJctime(jt);
+							v2.setValue1(map.get("value2").toString());
+							v2.setValue2(map.get("value3").toString());
+							value.setIfbj(map.get("ifbj").toString());
+							dataList.add(v2);
 						}
+
 						List guzhanglist = Search_CGQ_new(mark);
-						//检测是否故障
+						//����Ƿ����
 						if(guzhanglist.size()>0){
 							for(int i = 0;i<guzhanglist.size();i++){
 								value valuee = (value)guzhanglist.get(i);
@@ -216,15 +187,14 @@ public class co2jianceImpl implements jiangyuliangDao {
 						}else{
 							value.setIfguzhang("0");
 						}
-						value.setData(listValue);
-						value.setIfbj(id + "");
+						System.out.println("传感器编号:" + sensor.getState());
 						value.setName(station.getStation());
-
+						value.setPoumian(sensor.getState());
+						value.setData(dataList);
 						listAll.add(value);
 					}
 				}
 			}
-
 			tx.commit();
 		} catch (Exception e) {
 			e.printStackTrace();
@@ -233,6 +203,7 @@ public class co2jianceImpl implements jiangyuliangDao {
 			}
 		} finally {
 			HibernateUtil.close(session);
+			//dataList.clear();
 		}
 		return listAll;
 	}
@@ -247,7 +218,7 @@ public class co2jianceImpl implements jiangyuliangDao {
 		List<Object> list = null;
 		List listAll = new ArrayList();
 		try {
-			// Person是类的名字而不是表的名字，既然是类的名字就需要严格区分大小写
+			// Person��������ֶ����DZ�����֣���Ȼ��������־���Ҫ�ϸ����ִ�Сд
 			Query query;
 			String a = "FROM TabSensor WHERE mark = '" + mark
 					+ "' order by name";
@@ -296,8 +267,8 @@ public class co2jianceImpl implements jiangyuliangDao {
 
 	/**
 	 * @author Administrator
-	 * @param 传感器
-	 *            ,用户,原因 //解除报警
+	 * @param ������
+	 *            ,�û�,ԭ�� //�������
 	 */
 	public int logstopalarm(String sensorname, String username, String reason) {
 		Session session = HibernateUtil.openSession();
@@ -313,9 +284,9 @@ public class co2jianceImpl implements jiangyuliangDao {
 			work2.setUsername(username);
 			work2.setReason(reason);
 			work2.setJiechutime(ts);
-			work2.setKind("气体监测");
+			work2.setKind("������");
 			ht.save(work2);
-			// 更新报警状态
+			// ���±���״̬
 			Query query;
 			query = (Query) session
 					.createQuery("update  TabGas user2 set user2.ifbj ='0' ,user2.jcbjtime = '"
@@ -325,7 +296,7 @@ public class co2jianceImpl implements jiangyuliangDao {
 							+ "' and ifbj ='1' ");
 			((org.hibernate.Query) query).executeUpdate();
 			query = (Query) session
-			.createQuery( "delete from TabAlarmtype where alarmtype = '气体监测'");
+			.createQuery( "delete from TabAlarmtype where alarmtype = '������'");
 			((org.hibernate.Query) query).executeUpdate();
 			tx.commit();
 			try {
@@ -634,9 +605,9 @@ public class co2jianceImpl implements jiangyuliangDao {
 	}
 
 	/**
-	 * mark：类型
+	 * mark������
 	 *
-	 * @return 传感器状态
+	 * @return ������״̬
 	 */
 	@SuppressWarnings("unchecked")
 	public List<Object> Search_CGQ_new(String mark) {
@@ -677,7 +648,7 @@ public class co2jianceImpl implements jiangyuliangDao {
 	}
 
 	/**
-	 * 图表数据分页
+	 * ͼ�����ݷ�ҳ
 	 */
 	@SuppressWarnings("unchecked")
 	public List fenyeDay(int onePageSize, int fromRecord, String mark) {
@@ -687,7 +658,7 @@ public class co2jianceImpl implements jiangyuliangDao {
 		SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM");
 		Date time = new Date();
 		try {
-			// Person是类的名字而不是表的名字，既然是类的名字就需要严格区分大小写
+			// Person��������ֶ����DZ�����֣���Ȼ��������־���Ҫ�ϸ����ִ�Сд
 			Query query;
 			query = session
 					.createQuery(" SELECT sum(value2) as value2,max(to_char(jctime,'yyyy-mm-dd')) as jctime FROM "
@@ -717,7 +688,7 @@ public class co2jianceImpl implements jiangyuliangDao {
 		Session session = HibernateUtil.openSession();
 		Transaction tx = session.beginTransaction();
 		try {
-			// Person是类的名字而不是表的名字，既然是类的名字就需要严格区分大小写
+			// Person��������ֶ����DZ�����֣���Ȼ��������־���Ҫ�ϸ����ִ�Сд
 			Query query;
 			query = session
 					.createQuery(" SELECT sum(value2) as value2,max(to_char(jctime,'yyyy-mm')) as jctime FROM "
@@ -746,7 +717,7 @@ public class co2jianceImpl implements jiangyuliangDao {
 		SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM");
 		Date time = new Date();
 		try {
-			// Person是类的名字而不是表的名字，既然是类的名字就需要严格区分大小写
+			// Person��������ֶ����DZ�����֣���Ȼ��������־���Ҫ�ϸ����ִ�Сд
 			Query query;
 			query = session
 					.createQuery("SELECT sum(value2) as value2,max(to_char(jctime,'yyyy-mm-dd')) as jctime FROM "
@@ -773,7 +744,7 @@ public class co2jianceImpl implements jiangyuliangDao {
 		Session session = HibernateUtil.openSession();
 		Transaction tx = session.beginTransaction();
 		try {
-			// Person是类的名字而不是表的名字，既然是类的名字就需要严格区分大小写
+			// Person��������ֶ����DZ�����֣���Ȼ��������־���Ҫ�ϸ����ִ�Сд
 			Query query;
 			query = session
 					.createQuery(" SELECT sum(value2) as value2,max(to_char(jctime,'yyyy-mm')) as jctime FROM "

src/com/gemho/dao/cojianceImpl.java

@@ -35,7 +35,7 @@ public class cojianceImpl implements jiangyuliangDao {
 		List listAll = new ArrayList();
 		int id = 0;
 		try {
-			// Person是类的名字而不是表的名字，既然是类的名字就需要严格区分大小写
+			// Person��������ֶ����DZ�����֣���Ȼ��������־���Ҫ�ϸ����ִ�Сд
 			Query query;
 			String a = "FROM TabSensor WHERE mark = '" + mark
 					+ "' order by name";
@@ -76,7 +76,7 @@ public class cojianceImpl implements jiangyuliangDao {
 					listValue.add(value2);
 				}
 				List guzhanglist = Search_CGQ_new(mark);
-				//检测是否故障
+				//����Ƿ����
 				if(guzhanglist.size()>0){
 				for(int i = 0;i<guzhanglist.size();i++){
 					value valuee = (value)guzhanglist.get(i);
@@ -124,83 +124,57 @@ public class cojianceImpl implements jiangyuliangDao {
 	public List getCo2(String mark,String state, String zduan) {
 		Session session = HibernateUtil.openSession();
 		Transaction tx = session.beginTransaction();
-		String sql = "";
-		List<Object> list = null;
-		List<Object> liststation = null;
 		List listAll = new ArrayList();
-
 		try {
-			// Person是类的名字而不是表的名字，既然是类的名字就需要严格区分大小写
-			Query query;
-			String a = "FROM TabSensor WHERE  state='"+state+"' order by name";
-			list = session.createQuery(a).list();
-
 			if (zduan.length() == 0) {
 				zduan = "2";
 			}
 			String b = "FROM TabStation WHERE zduan = '" + zduan
 					+ "' and id < 10 order by station";
-
-			liststation = session.createQuery(b).list();
-			for (int i2 = 0; i2 < liststation.size(); i2++) {
-				value value = new value();
-				TabStation station = (TabStation) liststation.get(i2);
-				sql = "select a.jctime,a.value2,a.value3,a.ifbj,a.ifstart from"+
-						" (SELECT to_char(jctime,'yyyy-mm-dd HH24:mm:ss')as jctime,value2,value3,ifbj,ifstart, rank() over (partition by to_char(jctime, 'yyyy-mm-dd HH24') order by to_char(jctime, 'yyyy-mm-dd HH24:mm:ss') desc)" +
-						" FROM tab_yiyanghuatan gas where jctime >=(current_date) and ifview=0 and sensorname = '" +station.getStation() + "' order by jctime) as a" +
-						" where a.rank = 1";
-				query = session.createSQLQuery(sql).setResultTransformer(
-						Transformers.ALIAS_TO_ENTITY_MAP);
-				List list1 = (List<Object>) query.list();
-				List listValue = new ArrayList();
-				String alarm = null;
-				int id = 0;
-				for (int j = 0; j < list.size(); j++) {
-					TabSensor TabSensor2 = (TabSensor) list.get(j);
-					alarm = TabSensor2.getAlarmvalue();
-					if (station.getStation().equals(TabSensor2.getNotalarmvalue())) {
-						if (alarm.contains("|")) {
-							String[] alarmvalue = alarm.split("\\|");
-							TabSensor2.setAlarmvalue1(alarmvalue[0]);
-							TabSensor2.setAlarmvalue2(alarmvalue[1]);
-							if (alarmvalue.length > 2) {
-								TabSensor2.setAlarmvalue3(alarmvalue[2]);
+			List<TabStation> liststation = session.createQuery(b).list();
+			listAll = new ArrayList();
+			for (TabStation station: liststation) {
+				String sensorSql = "FROM TabSensor WHERE state like '%co%' and state != 'co2' and notalarmvalue = '" + station.getStation() + "' order by name";
+				List<TabSensor> list = session.createQuery(sensorSql).list();
+				for (TabSensor sensor: list) {
+					List dataList = new ArrayList();
+					if (sensor.getNotalarmvalue().equals(station.getStation())) {
+						value value = new value();
+						if (sensor.getAlarmvalue().contains("|")) {
+							String[] alarms = sensor.getAlarmvalue().split("\\|");
+							if (alarms.length > 2) {
+								value.setAlarm1(alarms[0]);
+								value.setAlarm1(alarms[1]);
+								value.setAlarm1(alarms[3]);
+							} else {
+								value.setAlarm1(alarms[0]);
+								value.setAlarm1(alarms[1]);
 							}
 						} else {
-							TabSensor2.setAlarmvalue1(alarm);
+							value.setAlarm1(sensor.getAlarmvalue());
 						}
-						value.setAlarm1(TabSensor2.getAlarmvalue1());
-						value.setAlarm2(TabSensor2.getAlarmvalue2());
-						value.setAlarm3(TabSensor2.getAlarmvalue3());
-
-
-						for (int i = 0; i < list1.size(); i++) {
-							value2 value2 = new value2();
-							Map map = (Map) list1.get(i);
+						String valSql = "select a.jctime,a.value2,a.value3,a.ifbj,a.ifstart from" +
+								" (SELECT to_char(jctime,'yyyy-MM-dd HH24:MI:ss') as jctime,value2,value3,ifbj,ifstart, rank() over (partition by to_char(jctime, 'yyyy-mm-dd HH24') order by to_char(jctime, 'yyyy-MM-dd HH24:MI:ss') desc)" +
+								" FROM tab_yiyanghuatan gas where jctime >=(current_date) and ifview=0 and zkname = '" + sensor.getState() + "' and sensorname = '" + station.getStation() + "' order by jctime) as a" +
+								" where a.rank = 1";
+						List<HashMap> valList = (List<HashMap>) session.createSQLQuery(valSql).setResultTransformer(Transformers.ALIAS_TO_ENTITY_MAP).list();
+						for (HashMap map : valList) {
+							value2 v2 = new value2();
 							String jctime = map.get("jctime").toString();
 							String jt = null;
-							if(jctime!=null){
+							if (jctime != null) {
 								jt = jctime.split(" ")[1].split("\\:")[0];
 							}
-							String yvalue1 = map.get("value2").toString();
-							String yvalue2 = map.get("value3").toString();
-							String ifbj = map.get("ifbj").toString();
-							String ifstart = map.get("ifstart").toString();
-							if ("1".equals(ifbj)) {
-								id = 1;
-							}
-
-							if("1".equals(ifstart)){ yvalue1 = null; }
-
-
-							value2.setJctime(jt);
-							value2.setValue(alarm);
-							value2.setValue1(yvalue1);
-							value2.setValue2(yvalue2);
-							listValue.add(value2);
+							v2.setValue(value.getAlarm1());
+							v2.setJctime(jt);
+							v2.setValue1(map.get("value2").toString());
+							v2.setValue2(map.get("value3").toString());
+							value.setIfbj(map.get("ifbj").toString());
+							dataList.add(v2);
 						}
+
 						List guzhanglist = Search_CGQ_new(mark);
-						//检测是否故障
+						//����Ƿ����
 						if(guzhanglist.size()>0){
 							for(int i = 0;i<guzhanglist.size();i++){
 								value valuee = (value)guzhanglist.get(i);
@@ -213,16 +187,14 @@ public class cojianceImpl implements jiangyuliangDao {
 						}else{
 							value.setIfguzhang("0");
 						}
-						value.setData(listValue);
-						value.setIfbj(id + "");
+						System.out.println("传感器编号:" + sensor.getState());
 						value.setName(station.getStation());
-
+						value.setPoumian(sensor.getState());
+						value.setData(dataList);
 						listAll.add(value);
 					}
 				}
-
 			}
-
 			tx.commit();
 		} catch (Exception e) {
 			e.printStackTrace();
@@ -231,6 +203,7 @@ public class cojianceImpl implements jiangyuliangDao {
 			}
 		} finally {
 			HibernateUtil.close(session);
+			//dataList.clear();
 		}
 		return listAll;
 	}
@@ -245,7 +218,7 @@ public class cojianceImpl implements jiangyuliangDao {
 		List<Object> list = null;
 		List listAll = new ArrayList();
 		try {
-			// Person是类的名字而不是表的名字，既然是类的名字就需要严格区分大小写
+			// Person��������ֶ����DZ�����֣���Ȼ��������־���Ҫ�ϸ����ִ�Сд
 			Query query;
 			String a = "FROM TabSensor WHERE mark = '" + mark
 					+ "' order by name";
@@ -294,8 +267,8 @@ public class cojianceImpl implements jiangyuliangDao {
 
 	/**
 	 * @author Administrator
-	 * @param 传感器
-	 *            ,用户,原因 //解除报警
+	 * @param ������
+	 *            ,�û�,ԭ�� //�������
 	 */
 	public int logstopalarm(String sensorname, String username, String reason) {
 		Session session = HibernateUtil.openSession();
@@ -311,9 +284,9 @@ public class cojianceImpl implements jiangyuliangDao {
 			work2.setUsername(username);
 			work2.setReason(reason);
 			work2.setJiechutime(ts);
-			work2.setKind("气体监测");
+			work2.setKind("������");
 			ht.save(work2);
-			// 更新报警状态
+			// ���±���״̬
 			Query query;
 			query = (Query) session
 					.createQuery("update  TabGas user2 set user2.ifbj ='0' ,user2.jcbjtime = '"
@@ -323,7 +296,7 @@ public class cojianceImpl implements jiangyuliangDao {
 							+ "' and ifbj ='1' ");
 			((Query) query).executeUpdate();
 			query = (Query) session
-			.createQuery( "delete from TabAlarmtype where alarmtype = '气体监测'");
+			.createQuery( "delete from TabAlarmtype where alarmtype = '������'");
 			((Query) query).executeUpdate();
 			tx.commit();
 			try {
@@ -632,9 +605,9 @@ public class cojianceImpl implements jiangyuliangDao {
 	}
 
 	/**
-	 * mark：类型
+	 * mark������
 	 *
-	 * @return 传感器状态
+	 * @return ������״̬
 	 */
 	@SuppressWarnings("unchecked")
 	public List<Object> Search_CGQ_new(String mark) {
@@ -675,7 +648,7 @@ public class cojianceImpl implements jiangyuliangDao {
 	}
 
 	/**
-	 * 图表数据分页
+	 * ͼ�����ݷ�ҳ
 	 */
 	@SuppressWarnings("unchecked")
 	public List fenyeDay(int onePageSize, int fromRecord, String mark) {
@@ -685,7 +658,7 @@ public class cojianceImpl implements jiangyuliangDao {
 		SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM");
 		Date time = new Date();
 		try {
-			// Person是类的名字而不是表的名字，既然是类的名字就需要严格区分大小写
+			// Person��������ֶ����DZ�����֣���Ȼ��������־���Ҫ�ϸ����ִ�Сд
 			Query query;
 			query = session
 					.createQuery(" SELECT sum(value2) as value2,max(to_char(jctime,'yyyy-mm-dd')) as jctime FROM "
@@ -715,7 +688,7 @@ public class cojianceImpl implements jiangyuliangDao {
 		Session session = HibernateUtil.openSession();
 		Transaction tx = session.beginTransaction();
 		try {
-			// Person是类的名字而不是表的名字，既然是类的名字就需要严格区分大小写
+			// Person��������ֶ����DZ�����֣���Ȼ��������־���Ҫ�ϸ����ִ�Сд
 			Query query;
 			query = session
 					.createQuery(" SELECT sum(value2) as value2,max(to_char(jctime,'yyyy-mm')) as jctime FROM "
@@ -744,7 +717,7 @@ public class cojianceImpl implements jiangyuliangDao {
 		SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM");
 		Date time = new Date();
 		try {
-			// Person是类的名字而不是表的名字，既然是类的名字就需要严格区分大小写
+			// Person��������ֶ����DZ�����֣���Ȼ��������־���Ҫ�ϸ����ִ�Сд
 			Query query;
 			query = session
 					.createQuery("SELECT sum(value2) as value2,max(to_char(jctime,'yyyy-mm-dd')) as jctime FROM "
@@ -771,7 +744,7 @@ public class cojianceImpl implements jiangyuliangDao {
 		Session session = HibernateUtil.openSession();
 		Transaction tx = session.beginTransaction();
 		try {
-			// Person是类的名字而不是表的名字，既然是类的名字就需要严格区分大小写
+			// Person��������ֶ����DZ�����֣���Ȼ��������־���Ҫ�ϸ����ִ�Сд
 			Query query;
 			query = session
 					.createQuery(" SELECT sum(value2) as value2,max(to_char(jctime,'yyyy-mm')) as jctime FROM "

src/com/gemho/dao/o2jianceImpl.java

@@ -6,11 +6,7 @@ import java.net.Socket;
 import java.sql.Timestamp;
 import java.text.ParseException;
 import java.text.SimpleDateFormat;
-import java.util.ArrayList;
-import java.util.Calendar;
-import java.util.Date;
-import java.util.List;
-import java.util.Map;
+import java.util.*;
 
 import com.gemho.bean.*;
 import org.hibernate.Query;
@@ -39,7 +35,7 @@ public class o2jianceImpl implements jiangyuliangDao {
 		List listAll = new ArrayList();
 		int id = 0;
 		try {
-			// Person是类的名字而不是表的名字，既然是类的名字就需要严格区分大小写
+			// Person��������ֶ����DZ�����֣���Ȼ��������־���Ҫ�ϸ����ִ�Сд
 			Query query;
 			String a = "FROM TabSensor WHERE mark = '" + mark
 					+ "' order by name";
@@ -80,7 +76,7 @@ public class o2jianceImpl implements jiangyuliangDao {
 					listValue.add(value2);
 				}
 				List guzhanglist = Search_CGQ_new(mark);
-				//检测是否故障
+				//����Ƿ����
 				if(guzhanglist.size()>0){
 				for(int i = 0;i<guzhanglist.size();i++){
 					value valuee = (value)guzhanglist.get(i);
@@ -125,88 +121,60 @@ public class o2jianceImpl implements jiangyuliangDao {
 		return listAll;
 	}
 
-	public List getO2(String mark, String state, String zduan) {
+	public List getO2(String mark,String state, String zduan) {
 		Session session = HibernateUtil.openSession();
 		Transaction tx = session.beginTransaction();
-		String sql = "";
-		List<Object> list = null;
-		List<Object> liststation = null;
 		List listAll = new ArrayList();
-
 		try {
-			// Person是类的名字而不是表的名字，既然是类的名字就需要严格区分大小写
-			Query query;
-			String a = "FROM TabSensor WHERE  state='"+state+"' order by name";
-			list = session.createQuery(a).list();
-
 			if (zduan.length() == 0) {
 				zduan = "2";
 			}
 			String b = "FROM TabStation WHERE zduan = '" + zduan
 					+ "' and id < 10 order by station";
-			System.out.println(b + "＝＝＝＝＝＝＝站点查询语句");
-			liststation = session.createQuery(b).list();
-			for (int i2 = 0; i2 < liststation.size(); i2++) {
-				value value = new value();
-				TabStation station = (TabStation) liststation.get(i2);
-				System.out.println("========================设备Id====" + station.getStation());
-
-				List listValue = new ArrayList();
-				String alarm = null;
-				int id = 0;
-				for (int j = 0; j < list.size(); j++) {
-					TabSensor TabSensor2 = (TabSensor) list.get(j);
-					alarm = TabSensor2.getAlarmvalue();
-					if (station.getStation().equals(TabSensor2.getNotalarmvalue())) {
-						if (alarm.contains("|")) {
-							String[] alarmvalue = alarm.split("\\|");
-							TabSensor2.setAlarmvalue1(alarmvalue[0]);
-							TabSensor2.setAlarmvalue2(alarmvalue[1]);
-							if (alarmvalue.length > 2) {
-								TabSensor2.setAlarmvalue3(alarmvalue[2]);
+			List<TabStation> liststation = session.createQuery(b).list();
+			listAll = new ArrayList();
+			for (TabStation station: liststation) {
+				String sensorSql = "FROM TabSensor WHERE state = '"+ state +"' and notalarmvalue = '" + station.getStation() + "' order by name";
+				List<TabSensor> list = session.createQuery(sensorSql).list();
+				for (TabSensor sensor: list) {
+					List dataList = new ArrayList();
+					if (sensor.getNotalarmvalue().equals(station.getStation())) {
+						value value = new value();
+						if (sensor.getAlarmvalue().contains("|")) {
+							String[] alarms = sensor.getAlarmvalue().split("\\|");
+							if (alarms.length > 2) {
+								value.setAlarm1(alarms[0]);
+								value.setAlarm1(alarms[1]);
+								value.setAlarm1(alarms[3]);
+							} else {
+								value.setAlarm1(alarms[0]);
+								value.setAlarm1(alarms[1]);
 							}
 						} else {
-							TabSensor2.setAlarmvalue1(alarm);
+							value.setAlarm1(sensor.getAlarmvalue());
 						}
-						value.setAlarm1(TabSensor2.getAlarmvalue1());
-						value.setAlarm2(TabSensor2.getAlarmvalue2());
-						value.setAlarm3(TabSensor2.getAlarmvalue3());
-
-						sql = "select a.jctime,a.value2,a.value3,a.ifbj,a.ifstart from"+
-								" (SELECT to_char(jctime,'yyyy-mm-dd HH24:mm:ss')as jctime,value2,value3,ifbj,ifstart, rank() over (partition by to_char(jctime, 'yyyy-mm-dd HH24') order by to_char(jctime, 'yyyy-mm-dd HH24:mm:ss') desc)" +
-								" FROM tab_yangqi gas where jctime >=(current_date) and ifview=0 and sensorname = '" +station.getStation() + "' order by jctime) as a" +
+						String valSql = "select a.jctime,a.value2,a.value3,a.ifbj,a.ifstart from" +
+								" (SELECT to_char(jctime,'yyyy-MM-dd HH24:MI:ss') as jctime,value2,value3,ifbj,ifstart, rank() over (partition by to_char(jctime, 'yyyy-mm-dd HH24') order by to_char(jctime, 'yyyy-MM-dd HH24:MI:ss') desc)" +
+								" FROM tab_yangqi gas where jctime >=(current_date) and ifview=0 and zkname = '" + sensor.getState() + "' and sensorname = '" + station.getStation() + "' order by jctime) as a" +
 								" where a.rank = 1";
-						query = session.createSQLQuery(sql).setResultTransformer(
-								Transformers.ALIAS_TO_ENTITY_MAP);
-						List list1 = (List<Object>) query.list();
-
-						for (int i = 0; i < list1.size(); i++) {
-							value2 value2 = new value2();
-							Map map = (Map) list1.get(i);
+						List<HashMap> valList = (List<HashMap>) session.createSQLQuery(valSql).setResultTransformer(Transformers.ALIAS_TO_ENTITY_MAP).list();
+						for (HashMap map : valList) {
+							value2 v2 = new value2();
 							String jctime = map.get("jctime").toString();
 							String jt = null;
-							if(jctime!=null){
+							if (jctime != null) {
 								jt = jctime.split(" ")[1].split("\\:")[0];
 							}
-							String yvalue1 = map.get("value2").toString();
-							String yvalue2 = map.get("value3").toString();
-							String ifbj = map.get("ifbj").toString();
-							String ifstart = map.get("ifstart").toString();
-							if ("1".equals(ifbj)) {
-								id = 1;
-							}
-
-							if("1".equals(ifstart)){ yvalue1 = null; }
-
-
-							value2.setJctime(jt);
-							value2.setValue(alarm);
-							value2.setValue1(yvalue1);
-							value2.setValue2(yvalue2);
-							listValue.add(value2);
+							v2.setValue(value.getAlarm1());
+							v2.setJctime(jt);
+							v2.setValue1(map.get("value2").toString());
+							v2.setValue2(map.get("value3").toString());
+							value.setIfbj(map.get("ifbj").toString());
+							dataList.add(v2);
 						}
+
 						List guzhanglist = Search_CGQ_new(mark);
-						//检测是否故障
+						//����Ƿ����
 						if(guzhanglist.size()>0){
 							for(int i = 0;i<guzhanglist.size();i++){
 								value valuee = (value)guzhanglist.get(i);
@@ -219,15 +187,14 @@ public class o2jianceImpl implements jiangyuliangDao {
 						}else{
 							value.setIfguzhang("0");
 						}
-						value.setData(listValue);
-						value.setIfbj(id + "");
+						System.out.println("传感器编号:" + sensor.getState());
 						value.setName(station.getStation());
-
+						value.setPoumian(sensor.getState());
+						value.setData(dataList);
 						listAll.add(value);
 					}
 				}
 			}
-
 			tx.commit();
 		} catch (Exception e) {
 			e.printStackTrace();
@@ -236,6 +203,7 @@ public class o2jianceImpl implements jiangyuliangDao {
 			}
 		} finally {
 			HibernateUtil.close(session);
+			//dataList.clear();
 		}
 		return listAll;
 	}
@@ -249,7 +217,7 @@ public class o2jianceImpl implements jiangyuliangDao {
 		List<Object> list = null;
 		List listAll = new ArrayList();
 		try {
-			// Person是类的名字而不是表的名字，既然是类的名字就需要严格区分大小写
+			// Person��������ֶ����DZ�����֣���Ȼ��������־���Ҫ�ϸ����ִ�Сд
 			Query query;
 			String a = "FROM TabSensor WHERE mark = '" + mark
 					+ "' order by name";
@@ -298,8 +266,8 @@ public class o2jianceImpl implements jiangyuliangDao {
 
 	/**
 	 * @author Administrator
-	 * @param 传感器
-	 *            ,用户,原因 //解除报警
+	 * @param ������
+	 *            ,�û�,ԭ�� //�������
 	 */
 	public int logstopalarm(String sensorname, String username, String reason) {
 		Session session = HibernateUtil.openSession();
@@ -315,9 +283,9 @@ public class o2jianceImpl implements jiangyuliangDao {
 			work2.setUsername(username);
 			work2.setReason(reason);
 			work2.setJiechutime(ts);
-			work2.setKind("气体监测");
+			work2.setKind("������");
 			ht.save(work2);
-			// 更新报警状态
+			// ���±���״̬
 			Query query;
 			query = (Query) session
 					.createQuery("update  TabGas user2 set user2.ifbj ='0' ,user2.jcbjtime = '"
@@ -327,7 +295,7 @@ public class o2jianceImpl implements jiangyuliangDao {
 							+ "' and ifbj ='1' ");
 			((org.hibernate.Query) query).executeUpdate();
 			query = (Query) session
-			.createQuery( "delete from TabAlarmtype where alarmtype = '气体监测'");
+			.createQuery( "delete from TabAlarmtype where alarmtype = '������'");
 			((org.hibernate.Query) query).executeUpdate();
 			tx.commit();
 			try {
@@ -636,9 +604,9 @@ public class o2jianceImpl implements jiangyuliangDao {
 	}
 
 	/**
-	 * mark：类型
+	 * mark������
 	 *
-	 * @return 传感器状态
+	 * @return ������״̬
 	 */
 	@SuppressWarnings("unchecked")
 	public List<Object> Search_CGQ_new(String mark) {
@@ -679,7 +647,7 @@ public class o2jianceImpl implements jiangyuliangDao {
 	}
 
 	/**
-	 * 图表数据分页
+	 * ͼ�����ݷ�ҳ
 	 */
 	@SuppressWarnings("unchecked")
 	public List fenyeDay(int onePageSize, int fromRecord, String mark) {
@@ -689,7 +657,7 @@ public class o2jianceImpl implements jiangyuliangDao {
 		SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM");
 		Date time = new Date();
 		try {
-			// Person是类的名字而不是表的名字，既然是类的名字就需要严格区分大小写
+			// Person��������ֶ����DZ�����֣���Ȼ��������־���Ҫ�ϸ����ִ�Сд
 			Query query;
 			query = session
 					.createQuery(" SELECT sum(value2) as value2,max(to_char(jctime,'yyyy-mm-dd')) as jctime FROM "
@@ -719,7 +687,7 @@ public class o2jianceImpl implements jiangyuliangDao {
 		Session session = HibernateUtil.openSession();
 		Transaction tx = session.beginTransaction();
 		try {
-			// Person是类的名字而不是表的名字，既然是类的名字就需要严格区分大小写
+			// Person��������ֶ����DZ�����֣���Ȼ��������־���Ҫ�ϸ����ִ�Сд
 			Query query;
 			query = session
 					.createQuery(" SELECT sum(value2) as value2,max(to_char(jctime,'yyyy-mm')) as jctime FROM "
@@ -748,7 +716,7 @@ public class o2jianceImpl implements jiangyuliangDao {
 		SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM");
 		Date time = new Date();
 		try {
-			// Person是类的名字而不是表的名字，既然是类的名字就需要严格区分大小写
+			// Person��������ֶ����DZ�����֣���Ȼ��������־���Ҫ�ϸ����ִ�Сд
 			Query query;
 			query = session
 					.createQuery("SELECT sum(value2) as value2,max(to_char(jctime,'yyyy-mm-dd')) as jctime FROM "
@@ -775,7 +743,7 @@ public class o2jianceImpl implements jiangyuliangDao {
 		Session session = HibernateUtil.openSession();
 		Transaction tx = session.beginTransaction();
 		try {
-			// Person是类的名字而不是表的名字，既然是类的名字就需要严格区分大小写
+			// Person��������ֶ����DZ�����֣���Ȼ��������־���Ҫ�ϸ����ִ�Сд
 			Query query;
 			query = session
 					.createQuery(" SELECT sum(value2) as value2,max(to_char(jctime,'yyyy-mm')) as jctime FROM "