修改停机事件弹出功能

src/com/hcks/cmfds/action/event/ShutDownAction.java

@@ -1,3 +1,10 @@
+/**
+ * <p>文件名:	ShutDownAction.java</p>
+ * <p>版权:  </p>
+ * <p>公司:	company Co., Ltd.</p>
+ * <p>项目名：lnly</p>
+ * <p>作者：	刘厦(liusha.information@gmail.com)</p>
+ */
 package com.hcks.cmfds.action.event;
 
 import java.io.InputStream;
@@ -25,7 +32,7 @@ import com.hcks.cmfds.core.web.action.PaginationAction;
 import com.hcks.cmfds.model.Earlywarning;
 import com.hcks.cmfds.model.Earlywarningrecordmain;
 import com.hcks.cmfds.model.Earlywarningrecordsub;
-import com.hcks.cmfds.model.Shutdownevent2;
+import com.hcks.cmfds.model.Shutdownevent;
 import com.hcks.cmfds.model.Stoptype;
 import com.hcks.cmfds.model.Windpowerstation;
 import com.hcks.cmfds.model.warn.WarningRecords;
@@ -59,7 +66,7 @@ public class ShutDownAction extends PaginationAction {
 
 	private List<Windpowerstation> wps;
 
-	private List<Shutdownevent2> events;
+	private List<Shutdownevent> events;
 
 	private List<ShutdowneventVo> vos;
 	
@@ -67,7 +74,7 @@ public class ShutDownAction extends PaginationAction {
 
 	private List<WarningRecords> warningRecords;
 
-	private Shutdownevent2 event;
+	private Shutdownevent event;
 
 	private ShutdowneventVo eventVo;
 
@@ -80,11 +87,6 @@ public class ShutDownAction extends PaginationAction {
 	private String wtId;
 	
 	private String type;
-	
-	
-	private String eventdata;
-
-	private String warndata;
 
 	private WindPowerStationService windPowerStationService;
 
@@ -106,10 +108,22 @@ public class ShutDownAction extends PaginationAction {
 
 	@Action(value = "index", results = { @Result(name = "success", location = "/pages/event/shutDown.jsp") })
 	public String index() {
+		Calendar cal = Calendar.getInstance();
+
+			
 		if (beginDate == null)
-			beginDate = DateUtils.parseDate(DateUtils.getCurrtenFirstDay());
+		{
+			
+			beginDate =DateUtils.truncate(cal.getTime());
+
+		}
 		if (endDate == null)
-			endDate = DateUtils.parseDate(DateUtils.getCurrtenLastDay());
+		{
+			cal.add(Calendar.DAY_OF_MONTH, 1);
+			endDate = DateUtils.truncate(cal.getTime());
+		}
+			
+		
 		wps = CacheContext.wpls;
 		stls= CacheContext.stls;
 		setUrlInfo();
@@ -175,8 +189,9 @@ public class ShutDownAction extends PaginationAction {
 	            ws.addCell(new Label(5, 0, "状态"));  
 	            ws.addCell(new Label(6, 0, "停机类型"));            
 	            ws.addCell(new Label(7, 0, "损失电量(kWh)"));  
-	            ws.addCell(new Label(8, 0, "报警信息"));  
-
+	            ws.addCell(new Label(8, 0, "处理方式"));  
+	            ws.addCell(new Label(9, 0, "故障现象"));  
+	            ws.addCell(new Label(10, 0, "报警信息"));  
 	    
 	 
 
@@ -190,8 +205,8 @@ public class ShutDownAction extends PaginationAction {
 	            ws.setColumnView(6, 20);  
 	            ws.setColumnView(7, 20);  
 	            ws.setColumnView(8, 40);  
- 
-
+	            ws.setColumnView(9, 40);  
+	            ws.setColumnView(10, 40); 
 	
 
 	  
@@ -213,6 +228,8 @@ public class ShutDownAction extends PaginationAction {
 	                ws.addCell(new Label(6, i + 1, "" + vo.getStopTypeName()));  
 	                ws.addCell(new Label(7, i + 1, "" +vo.getLossPower())); 
 	                ws.addCell(new Label(8, i + 1, "" + vo.getHandleWay()));  
+	                ws.addCell(new Label(9, i + 1, "" +vo.getFaultView())); 
+	                ws.addCell(new Label(10, i + 1, "" +vo.getWarnDesc())); 
 	                i++;  
 	            }  
 	            wwb.write();  
@@ -276,10 +293,10 @@ public class ShutDownAction extends PaginationAction {
 		
 		if(total.remainder(size).doubleValue()!=0)
 		{
-			map.put("pagecount", total.divide(size).intValue()+1);
+			map.put("pagecount", total.divide(size,2, BigDecimal.ROUND_HALF_UP).intValue()+1);
 		}else
 		{
-			map.put("pagecount", total.divide(size).intValue());
+			map.put("pagecount", total.divide(size,2, BigDecimal.ROUND_HALF_UP).intValue());
 		}
 		json = JsonUtils.toJson(map);
 
@@ -334,32 +351,25 @@ public class ShutDownAction extends PaginationAction {
 
 	@Action(value = "readWarm")
 	public String readWarm() {
-		event = shutDownEventService.getshutdownone(event.getId()).get(0);
+		event = shutDownEventService.get(event.getId());
 		warningRecords = shutDownEventService.getWarnList(event, event.getWarningId());
-		for(WarningRecords wr:warningRecords){
-			if(warndata.equals(wr.getId()+"")){
-				wr.setLevelname("<input  type='button' style='color:red;' onclick=updateevent('"+wr.getId()+"','"+event.getId()+"') value='"+wr.getId()+"'/>");
-			}else{
-				wr.setLevelname("<input  type='button' onclick=updateevent('"+wr.getId()+"','"+event.getId()+"') value='"+wr.getId()+"'/>");
-	
-			}
-		}
 		json = JsonUtils.toJson(warningRecords);
 		return JSON;
 	}
 	
-	
-	
-	@Action(value = "updateevent")
-	public String updateevent() {
-		String str=shutDownEventService.getdescribe(warndata);
-		str=str.replaceAll("\\s","");
-		shutDownEventService.updatedecribe(warndata,str,eventdata);
-		json = JsonUtils.toJson("SUCCESSS");
+	@Action(value = "readWarmByevent")
+	public String readWarmByevent() {
+		
+		List<ShutdowneventVo> ls=shutDownEventService.queryEventsByWt(wtId);
+		if(null!=ls && !ls.isEmpty())
+		{
+			event = shutDownEventService.get(ls.get(0).getId());
+			warningRecords = shutDownEventService.getWarnList(event, event.getWarningId());
+			json = JsonUtils.toJson(warningRecords);
+		}
+		
 		return JSON;
 	}
-	
-	
 	@Action(value = "earlyWarm")
 	public String earlyWarm() {
 		event = shutDownEventService.get(event.getId());
@@ -498,9 +508,6 @@ public class ShutDownAction extends PaginationAction {
 		return SUCCESS;
 	}
 
-	
-	
-	
 	public List<Windpowerstation> getWps() {
 		return wps;
 	}
@@ -509,11 +516,11 @@ public class ShutDownAction extends PaginationAction {
 		this.wps = wps;
 	}
 
-	public List<Shutdownevent2> getEvents() {
+	public List<Shutdownevent> getEvents() {
 		return events;
 	}
 
-	public void setEvents(List<Shutdownevent2> events) {
+	public void setEvents(List<Shutdownevent> events) {
 		this.events = events;
 	}
 
@@ -589,11 +596,11 @@ public class ShutDownAction extends PaginationAction {
 		this.lps = lps;
 	}
 
-	public Shutdownevent2 getEvent() {
+	public Shutdownevent getEvent() {
 		return event;
 	}
 
-	public void setEvent(Shutdownevent2 event) {
+	public void setEvent(Shutdownevent event) {
 		this.event = event;
 	}
 
@@ -668,23 +675,6 @@ public class ShutDownAction extends PaginationAction {
 	public void setStls(List<Stoptype> stls) {
     	this.stls = stls;
     }
-
-
-
-	public String getEventdata() {
-		return eventdata;
-	}
-
-	public void setEventdata(String eventdata) {
-		this.eventdata = eventdata;
-	}
-
-	public String getWarndata() {
-		return warndata;
-	}
-
-	public void setWarndata(String warndata) {
-		this.warndata = warndata;
-	}
 	
+
 }

src/com/hcks/cmfds/service/event/ShutDownEventService.java

@@ -6,9 +6,7 @@ import java.text.SimpleDateFormat;
 import java.util.ArrayList;
 import java.util.Calendar;
 import java.util.Date;
-import java.util.HashMap;
 import java.util.List;
-import java.util.Map;
 
 import org.springframework.jdbc.core.RowMapper;
 import org.springframework.stereotype.Service;
@@ -19,8 +17,8 @@ import com.hcks.cmfds.commons.util.DateUtils;
 import com.hcks.cmfds.commons.util.StringUtils;
 import com.hcks.cmfds.core.persistence.GenericJdbcDao;
 import com.hcks.cmfds.model.Shutdownevent;
-import com.hcks.cmfds.model.Shutdownevent2;
 import com.hcks.cmfds.model.WindTurbineStatus;
+import com.hcks.cmfds.model.Windturbine;
 import com.hcks.cmfds.model.Windturbineinfoday;
 import com.hcks.cmfds.model.warn.Warning;
 import com.hcks.cmfds.model.warn.WarningRecords;
@@ -39,93 +37,17 @@ import com.hcks.cmfds.vo.StopTypeTreeVo;
  * 
  */
 @Service
-public class ShutDownEventService extends GenericJdbcDao<Shutdownevent2> {
+public class ShutDownEventService extends GenericJdbcDao<Shutdownevent> {
 
     private SimpleDateFormat format = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
 
-    
-    
-    public void updateevent(String id){
-    	
-    }
-    
-    //通过id获取到报警值描述
-    public String getdescribe(String id){
-    	String sb="select id,chinesetext from warning where id='"+id+"'";
-    	List<Warning> lwar=operate.query(sb.toString(), new RowMapper() {
-
-            @Override
-            public Object mapRow(ResultSet rs, int num) throws SQLException {
-            	Warning war=new Warning();
-                war.setId(rs.getString("id"));
-                war.setChinesetext(rs.getString("chinesetext"));
-                return war;
-            	}
-            });
-           Warning warn=lwar.get(0);
-           return warn.getChinesetext(); 
-    }
-    
-    
-    
-    
-    
-    //通过id获取到shutdownevent数据
-    public List<Shutdownevent2> getshutdownone(String id){
-    	String sb="select * from shutdownevent where id='"+id+"'";
-    	List<Shutdownevent2> ls=operate.query(sb, new RowMapper() {
-
-            @Override
-            public Object mapRow(ResultSet rs, int num) throws SQLException {
-                Shutdownevent2 event = new Shutdownevent2();
-                event.setId(rs.getString("id"));
-                event.setWindPowerStationId(rs.getString("windPowerStationId"));
-                event.setWindTurbineId(rs.getString("windTurbineId"));
-//                event.setWtName(CacheContext.wpmap.get(rs.getString("windTurbineId")).getCode());
-                event.setWarningId(rs.getString("warningId"));
-                event.setStartTime(rs.getTimestamp("startTime"));
-                event.setStopTime(rs.getTimestamp("stopTime"));
-                event.setStopHours(rs.getDouble("stopHours"));
-                event.setStopTypeId(rs.getString("stopTypeId"));
-                event.setStatusCode(rs.getInt("statusCode"));
-                event.setIsHandle(rs.getBoolean("isHandle"));
-                event.setProjectid(rs.getString("projectid"));
-                event.setLossPower(rs.getDouble("lossPower"));
-                event.setFaultView(rs.getString("faultView"));
-                event.setHandleWay(rs.getString("handleWay"));
-                return event;
-            }
-
-        });
-    	return ls;
-    }
-    
-    
-    
-    
-    //根据报警描述修改shutdownevent2,warnid,描述,eventid
-    public void updatedecribe(String warndata,String str,String id){
-    	String st="update Shutdownevent set warningid='"+warndata+"',handleway='"+str+"' where id='"+id+"'";
-    	System.out.println(st);
-    	operate.update(st);
-        }
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
     @SuppressWarnings("unchecked")
     public List<ShutdowneventVo> queryEvents(String modelId, String wpId, String wtId, Date queryDate, int type, int offset, int maxResults) {
         StringBuilder sb = new StringBuilder();
         sb.append("select ROW_NUMBER() Over(order by w.modelId desc,r.stopTime desc) num, ");
         sb.append(" r.id,r.windPowerStationId,r.windTurbineId,r.stopTime,r.startTime,r.stopHours,r.lossPower,r.stopTypeId");
         sb.append(",r.isHandle ,r.warningId,r.projectId,r.handleWay,r.faultView,r.statusCode,w.modelId ");
-        sb.append("from Shutdownevent2 r,Windturbine w where 1=1 and r.windTurbineId=w.id ");
+        sb.append("from Shutdownevent r,Windturbine w where 1=1 and r.windTurbineId=w.id ");
         List<Object> objs = new ArrayList<Object>();
 
         if (StringUtils.notEmp(wpId)) {
@@ -225,10 +147,10 @@ public class ShutDownEventService extends GenericJdbcDao<Shutdownevent2> {
     @SuppressWarnings("unchecked")
     public List<ShutdowneventVo> queryEvents(String wtId, Date beginDate, Date endDate, int offset, int maxResults, String sortOrder, String sortName) {
         StringBuilder sb = new StringBuilder();
-        sb.append("select ROW_NUMBER() Over(order by w.modelId desc,r.stopTime desc) num, ");
+        sb.append("select ROW_NUMBER() Over(order by w.modelId desc,r."+sortOrder+" "+sortName+") num, ");
         sb.append(" r.id,r.windPowerStationId,r.windTurbineId,r.stopTime,r.startTime,r.stopHours,r.lossPower,r.stopTypeId");
         sb.append(",r.isHandle ,r.warningId,r.projectId,r.handleWay,r.faultView,r.statusCode,w.modelId ");
-        sb.append("from Shutdownevent2 r,Windturbine w where 1=1 and r.windTurbineId=w.id ");
+        sb.append("from Shutdownevent r,Windturbine w where 1=1 and r.windTurbineId=w.id ");
         List<Object> objs = new ArrayList<Object>();
 
         if (StringUtils.notEmp(wtId)) {
@@ -266,7 +188,11 @@ public class ShutDownEventService extends GenericJdbcDao<Shutdownevent2> {
                 event.setWindPowerStationId(rs.getString("windPowerStationId"));
                 event.setWpName(CacheContext.wpmap.get(rs.getString("windPowerStationId")).getName());
                 event.setWindTurbineId(rs.getString("windTurbineId"));
-
+                if(CacheContext.wtmap.containsKey(rs.getString("windTurbineId")))
+				{
+					Windturbine wt=CacheContext.wtmap.get(rs.getString("windTurbineId"));
+					event.setCode(wt.getCode());
+				}
                 event.setWarningId(rs.getString("warningId"));
                 event.setWarnDesc("");
                 event.setStartTime(rs.getTimestamp("startTime"));
@@ -295,7 +221,7 @@ public class ShutDownEventService extends GenericJdbcDao<Shutdownevent2> {
         // sb.append("select ROW_NUMBER() Over(order by w.modelId desc,r.stopTime desc) num, ");
         // sb.append(" r.id,r.windPowerStationId,r.windTurbineId,r.stopTime,r.startTime,r.stopHours,r.lossPower,r.stopTypeId");
         // sb.append(",r.isHandle ,r.warningId,r.projectId,r.handleWay,r.faultView,r.statusCode,w.modelId ");
-        // sb.append("from Shutdownevent2 r,Windturbine w where 1=1 and r.windTurbineId=w.id ");
+        // sb.append("from Shutdownevent r,Windturbine w where 1=1 and r.windTurbineId=w.id ");
         //
 
         sb.append(" where 1=1 ");
@@ -353,29 +279,29 @@ public class ShutDownEventService extends GenericJdbcDao<Shutdownevent2> {
     @SuppressWarnings( { "unchecked", "rawtypes" })
     public List<ShutdowneventVo> queryEvents(String wpId, String wtId, Date beginDate, Date endDate, String type, int offset, int maxResults, String sortOrder, String sortName) {
         StringBuilder sb = new StringBuilder();
-        sb.append("select ROW_NUMBER() Over(order by s.stopTime desc) num, ");
-        sb.append("s.id,s.windpowerstationid, s.windturbineid, s.stoptime,s.starttime,s.stophours,s.losspower,s.stoptypeid,");
-        sb.append("s.ishandle,s.warningid,s.projectid,s.handleway,s.faultview,s.statuscode,w.chinesetext ");
-        sb.append("from Shutdownevent s left join warning w on s.warningid=w.id where 1=1");
+        sb.append("select ROW_NUMBER() Over(order by r."+sortOrder+" "+sortName+") num, ");
+        sb.append("id,windpowerstationid, windturbineid, stoptime,starttime,stophours,losspower,stoptypeid,");
+        sb.append("ishandle,warningid,projectid,handleway,faultview,statuscode ");
+        sb.append("from Shutdownevent r where 1=1 ");
         List<Object> objs = new ArrayList<Object>();
 
         if (StringUtils.notEmp(wpId)) {
-            sb.append(" and s.windPowerStationId=? ");
+            sb.append(" and r.windPowerStationId=? ");
             objs.add(wpId);
         }
 
         if (StringUtils.notEmp(wtId)) {
-            sb.append(" and s.windTurbineId=? ");
+            sb.append(" and r.windTurbineId=? ");
             objs.add(wtId);
         }
         if (StringUtils.notEmp(type)) {
-            sb.append(" and s.statusCode=? ");
+            sb.append(" and r.statusCode=? ");
             objs.add(Integer.valueOf(type));
 
         }
 
-        sb.append(" and s.stopTime >= ? ");
-        sb.append(" and s.stopTime <= ? ");
+        sb.append(" and r.stopTime >= ? ");
+        sb.append(" and r.stopTime <= ? ");
         java.sql.Date begin = new java.sql.Date(beginDate.getTime());
         java.sql.Date end = new java.sql.Date(endDate.getTime());
         objs.add(begin);
@@ -405,16 +331,14 @@ public class ShutDownEventService extends GenericJdbcDao<Shutdownevent2> {
                 event.setWindTurbineId(rs.getString("windTurbineId"));
                 event.setWtName(CacheContext.wtmap.get(rs.getString("windTurbineId")).getCode());
                 event.setWarningId(rs.getString("warningId"));
-                // List<WarningRecords> warnList =
-                // getWarnList(rs.getString("id"), rs.getString("warningId"));
-                // if (!warnList.isEmpty() && warnList.size() > 0) {
-                // StringBuffer sb = new StringBuffer();
-                // // for(WarningRecords warn:warnList){
-                // // sb.append(warn.getWarnDesc()).append(";");
-                // // }
-                // sb.append(warnList.get(0).getWarnDesc()).append(";.........");
-                // event.setWarnDesc(sb.toString());
-                // }
+                // List<WarningRecords> warnList = getWarnList(rs.getString("id"), rs.getString("warningId"));
+                 if (CacheContext.warnmap.containsKey(rs.getString("warningId"))) {
+                 StringBuffer sb = new StringBuffer();
+                 Warning warn=CacheContext.warnmap.get(rs.getString("warningId"));
+                 sb.append(warn.getChinesetext()).append(";.........");
+                 event.setWarnDesc(sb.toString());
+                 event.setFaultView(warn.getChinesetext());
+                 }
                 event.setStartTime(rs.getTimestamp("startTime"));
                 event.setStopTime(rs.getTimestamp("stopTime"));
                 event.setStopHours(rs.getDouble("stopHours"));
@@ -425,8 +349,8 @@ public class ShutDownEventService extends GenericJdbcDao<Shutdownevent2> {
                 event.setProjectid(rs.getString("projectid"));
                 event.setLossPower(rs.getDouble("lossPower"));
                 event.setProjectName(StringUtils.empty(rs.getString("projectid")) ? "" : CacheContext.pjmap.get(rs.getString("projectid")).getName());
-                event.setFaultView(rs.getString("faultView") == null ? "" : rs.getString("faultView"));
-                event.setHandleWay(rs.getString("chinesetext"));
+              //  event.setFaultView(rs.getString("faultView") == null ? "" : rs.getString("faultView"));
+                event.setHandleWay(rs.getString("handleWay") == null ? "" : rs.getString("handleWay"));
                 return event;
             }
 
@@ -437,29 +361,29 @@ public class ShutDownEventService extends GenericJdbcDao<Shutdownevent2> {
     @SuppressWarnings( { "unchecked", "rawtypes" })
     public List<ShutdowneventVo> queryEvents(String wpId, String wtId, Date beginDate, Date endDate, String type) {
         StringBuilder sb = new StringBuilder();
-        sb.append("select ROW_NUMBER() Over(order by s.stopTime desc) num, ");
-        sb.append("s.id,s.windpowerstationid, s.windturbineid, s.stoptime,s.starttime,s.stophours,s.losspower,s.stoptypeid,");
-        sb.append("s.ishandle,s.warningid,s.projectid,s.handleway,s.faultview,s.statuscode,w.chinesetext ");
-        sb.append("from Shutdownevent s,warning w where s.warningid=w.id ");
+        sb.append("select ROW_NUMBER() Over(order by r.stopTime desc) num, ");
+        sb.append("id,windpowerstationid, windturbineid, stoptime,starttime,stophours,losspower,stoptypeid,");
+        sb.append("ishandle,warningid,projectid,handleway,faultview,statuscode ");
+        sb.append("from Shutdownevent r where 1=1 ");
         List<Object> objs = new ArrayList<Object>();
 
         if (StringUtils.notEmp(wpId)) {
-            sb.append(" and s.windPowerStationId=? ");
+            sb.append(" and r.windPowerStationId=? ");
             objs.add(wpId);
         }
 
         if (StringUtils.notEmp(wtId)) {
-            sb.append(" and s.windTurbineId=? ");
+            sb.append(" and r.windTurbineId=? ");
             objs.add(wtId);
         }
         if (StringUtils.notEmp(type)) {
-            sb.append(" and s.statusCode=? ");
+            sb.append(" and r.statusCode=? ");
             objs.add(Integer.valueOf(type));
 
         }
 
-        sb.append(" and s.stopTime >= ? ");
-        sb.append(" and s.stopTime <= ? ");
+        sb.append(" and r.stopTime >= ? ");
+        sb.append(" and r.stopTime <= ? ");
         java.sql.Date begin = new java.sql.Date(beginDate.getTime());
         java.sql.Date end = new java.sql.Date(endDate.getTime());
         objs.add(begin);
@@ -487,16 +411,28 @@ public class ShutDownEventService extends GenericJdbcDao<Shutdownevent2> {
                 event.setWindTurbineId(rs.getString("windTurbineId"));
                 event.setWtName(CacheContext.wtmap.get(rs.getString("windTurbineId")).getCode());
                 event.setWarningId(rs.getString("warningId"));
-                // List<WarningRecords> warnList =
-                // getWarnList(rs.getString("id"), rs.getString("warningId"));
-                // if (!warnList.isEmpty() && warnList.size() > 0) {
-                // StringBuffer sb = new StringBuffer();
-                // // for(WarningRecords warn:warnList){
-                // // sb.append(warn.getWarnDesc()).append(";");
-                // // }
-                // sb.append(warnList.get(0).getWarnDesc()).append(";.........");
-                // event.setWarnDesc(sb.toString());
-                // }
+                
+                if(CacheContext.warnmap.containsKey(rs.getString("warningId")))	
+                {
+                	  StringBuilder sb = new StringBuilder();
+                	Warning warn=CacheContext.warnmap.get(rs.getString("warningId"));
+                	sb.append(warn.getChinesetext()).append(";.........");
+                    event.setWarnDesc(sb.toString());
+                    event.setFaultView(warn.getChinesetext());
+                }
+                
+                	
+//                 List<WarningRecords> warnList =
+//                 getWarnList(rs.getString("id"), rs.getString("warningId"));
+//                 if (!warnList.isEmpty() && warnList.size() > 0) {
+//                 StringBuffer sb = new StringBuffer();
+//                 // for(WarningRecords warn:warnList){
+//                 // sb.append(warn.getWarnDesc()).append(";");
+//                 // }
+//                 sb.append(warnList.get(0).getWarnDesc()).append(";.........");
+//                 event.setWarnDesc(sb.toString());
+//                 event.setFaultView(warnList.get(0).getWarnDesc());
+//                 }
                 event.setStartTime(rs.getTimestamp("startTime"));
                 event.setStopTime(rs.getTimestamp("stopTime"));
                 event.setStopHours(rs.getDouble("stopHours"));
@@ -507,8 +443,8 @@ public class ShutDownEventService extends GenericJdbcDao<Shutdownevent2> {
                 event.setProjectid(rs.getString("projectid"));
                 event.setLossPower(rs.getDouble("lossPower"));
                 event.setProjectName(CacheContext.pjmap.get(rs.getString("projectid")) == null ? "" : CacheContext.pjmap.get(rs.getString("projectid")).getName());
-                event.setFaultView(rs.getString("faultView") == null ? "" : rs.getString("faultView"));
-                event.setHandleWay(rs.getString("chinesetext"));
+                //event.setFaultView(rs.getString("faultView") == null ? "" : rs.getString("faultView"));
+                event.setHandleWay(rs.getString("handleWay") == null ? "" : rs.getString("handleWay"));
                 return event;
             }
 
@@ -516,10 +452,62 @@ public class ShutDownEventService extends GenericJdbcDao<Shutdownevent2> {
         return (List) list;
     }
 
+
+    public List<ShutdowneventVo> queryEventsByWt(String wtId) {
+        StringBuilder sb = new StringBuilder();
+        sb.append("select ROW_NUMBER() Over(order by r.stopTime desc) num, ");
+        sb.append("id,windpowerstationid, windturbineid, stoptime,starttime,stophours,losspower,stoptypeid,");
+        sb.append("ishandle,warningid,projectid,handleway,faultview,statuscode ");
+        sb.append("from Shutdownevent r where 1=1 ");
+        List<Object> objs = new ArrayList<Object>();
+
+        if (StringUtils.notEmp(wtId)) {
+            sb.append(" and r.windTurbineId=? ");
+            objs.add(wtId);
+        }
+        Calendar c = Calendar.getInstance();
+        c.add(Calendar.DAY_OF_MONTH, -1);
+        sb.append(" and r.stopTime >= ? ");
+
+        java.sql.Date begin = new java.sql.Date(c.getTime().getTime());
+        objs.add(begin);
+
+        sb.append(" order by  r.stopTime desc");
+
+        @SuppressWarnings("unchecked")
+		List<ShutdowneventVo> list = new ArrayList<ShutdowneventVo>(operate.query(sb.toString(), objs.toArray(new Object[0]), new RowMapper() {
+
+            @Override
+            public Object mapRow(ResultSet rs, int num) throws SQLException {
+                ShutdowneventVo event = new ShutdowneventVo();
+                event.setId(rs.getString("id"));
+                event.setWindPowerStationId(rs.getString("windPowerStationId"));
+                event.setWpName(CacheContext.wpmap.get(rs.getString("windPowerStationId")).getName());
+                event.setWindTurbineId(rs.getString("windTurbineId"));
+                event.setWtName(CacheContext.wtmap.get(rs.getString("windTurbineId")).getCode());
+                event.setWarningId(rs.getString("warningId"));
+                event.setStartTime(rs.getTimestamp("startTime"));
+                event.setStopTime(rs.getTimestamp("stopTime"));
+                event.setStopHours(rs.getDouble("stopHours"));
+                event.setStopTypeId(rs.getString("stopTypeId"));
+                event.setStatusCode(rs.getInt("statusCode"));
+                event.setStopTypeName(CacheContext.stmap.get(rs.getString("stopTypeId")) == null ? "" : CacheContext.stmap.get(rs.getString("stopTypeId")).getName());
+                event.setIsHandle(rs.getBoolean("isHandle"));
+                event.setProjectid(rs.getString("projectid"));
+                event.setLossPower(rs.getDouble("lossPower"));
+                event.setProjectName(CacheContext.pjmap.get(rs.getString("projectid")) == null ? "" : CacheContext.pjmap.get(rs.getString("projectid")).getName());
+                event.setFaultView(rs.getString("faultView") == null ? "" : rs.getString("faultView"));
+                event.setHandleWay(rs.getString("handleWay") == null ? "" : rs.getString("handleWay"));
+                return event;
+            }
+
+        }));
+        return (List) list;
+    }
     public void saveDetail(String[] ids, Double[] lps) {
         if (ids != null && ids.length > 0 && lps != null && lps.length > 0) {
             for (int i = 0; i < ids.length; i++) {
-                Shutdownevent2 event = get(ids[i]);
+                Shutdownevent event = get(ids[i]);
                 event.setLossPower(lps[i]);
                 update(event);
             }
@@ -527,7 +515,7 @@ public class ShutDownEventService extends GenericJdbcDao<Shutdownevent2> {
     }
 
     public void updateData(String id, ShutdowneventVo eventVo) throws Exception {
-        Shutdownevent2 event = (Shutdownevent2) operate.get(Shutdownevent2.class, id);
+        Shutdownevent event = (Shutdownevent) operate.get(Shutdownevent.class, id);
         event.setFaultView(eventVo.getFaultView());
         event.setHandleWay(eventVo.getHandleWay());
         event.setStopTypeId(eventVo.getStopTypeId());
@@ -599,7 +587,6 @@ public class ShutDownEventService extends GenericJdbcDao<Shutdownevent2> {
         }
         return list;
     }
-
     /**
      * 获得报警信息
      * 
@@ -609,48 +596,97 @@ public class ShutDownEventService extends GenericJdbcDao<Shutdownevent2> {
      * @return
      */
     @SuppressWarnings("unchecked")
-    public List<WarningRecords> getWarnList(Shutdownevent2 event, String warningId) {
+    public List<WarningRecords> getWarnList(String id, String warningId) {
         List<WarningRecords> list = null;
         StringBuilder sql = new StringBuilder();
-        sql.append("select w.id,to_char(r.warningtime,'yyyy-MM-dd HH24:mi:ss'),w.chinesetext from warningrecords r,warning w where ");
-        sql.append(String.format(" r.windturbineid='%s' and r.warningid=w.id  ", event.getWindTurbineId()));
-        final SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
-        Calendar c = Calendar.getInstance();
-        c.setTime(event.getStopTime());
-        c.add(Calendar.MINUTE, -15);
-        String beginStr = sdf.format(c.getTime());
-        c.add(Calendar.MINUTE, 30);
-        String endStr = sdf.format(c.getTime());
-        sql.append(String.format(" and r.warningtime>=to_date('%s','yyyy-MM-dd HH24:mi:ss')  ", beginStr));
-        sql.append(String.format(" and r.warningtime<=to_date('%s','yyyy-MM-dd HH24:mi:ss')  ", endStr));
-        // if (StringUtils.notEmp(id)) {
-        // sql.append(" and r.shutdowneventid='");
-        // sql.append(id);
-        // sql.append("'");
-        // }
-        // if (StringUtils.notEmp(warningId)) {
-        // sql.append(" and r.warningId='");
-        // sql.append(warningId);
-        // sql.append("'");
-        // }
+        sql.append("select w.id id,to_char(r.warningtime,'yyyy-MM-dd HH24:mi:ss') warntime,w.chinesetext warndesc from warningrecords r,warning w where ");
+        sql.append(String.format(" w.id='%s' and r.warningid=w.id  ", warningId));
+      
 
         list = new ArrayList<WarningRecords>(operate.query(String.valueOf(sql), new RowMapper() {
             @Override
             public Object mapRow(ResultSet rs, int arg1) throws SQLException {
                 WarningRecords warningRecords = new WarningRecords();
-                warningRecords.setId(rs.getInt(1));
+                warningRecords.setId(rs.getInt("id"));
 
-                warningRecords.setClassName(rs.getString(2));
+                warningRecords.setWarningtime(rs.getTimestamp("warntime"));
 
-                warningRecords.setWarnDesc(rs.getString(3));
+                warningRecords.setWarnDesc(rs.getString("warndesc"));
                 return warningRecords;
             }
 
         }));
         return list;
     }
+    /**
+     * 获得报警信息
+     * 
+     * @param wtId
+     * @param date
+     * @param num
+     * @return
+     */
+    @SuppressWarnings("unchecked")
+    public List<WarningRecords> getWarnList(Shutdownevent event, String warningId) {
+    	
+    	if(StringUtils.notEmp(event) && StringUtils.notEmp(event.getWindTurbineId()))
+    	{
+    		if(CacheContext.wtmap.containsKey(event.getWindTurbineId()))
+    		{
+    			Windturbine wt=CacheContext.wtmap.get(event.getWindTurbineId());
+    			List<WarningRecords> list = null;
+    	        StringBuilder sb = new StringBuilder("ALARMHISTORY_");
+    	        String wpId=wt.getWindpowerstationid();
+    	        wpId=wpId.substring(0, wpId.indexOf("_")+1);
+    	        sb.append(wpId);
+    	        Calendar c = Calendar.getInstance();
+    	        int year=c.get(Calendar.YEAR);
+    	        sb.append(year);
+    	        int month=c.get(Calendar.MONTH)+1;
+    	        if(month<10)
+    	        {
+    	        	sb.append("0").append(month);
+    	        }else
+    	        {
+    	        	sb.append(month);
+    	        }
+    	    
+    	        StringBuilder sql = new StringBuilder();
+    	        sql.append("select s.alertvalue id,t.alerttime warningtime,s.alerttext warnDesc from ").append(sb).append(" t,alarmsnap s where t.snapid=s.id   ");
+    	        sql.append(String.format("  and s.windturbineid='%s'  ", event.getWindTurbineId()));
+    	        final SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
+
+    	        c.setTime(event.getStopTime());
+    	        c.add(Calendar.MINUTE, -15);
+    	        String beginStr = sdf.format(c.getTime());
+    	        c.add(Calendar.MINUTE, 30);
+    	        String endStr = sdf.format(c.getTime());
+    	        sql.append(String.format(" and t.alerttime>=to_date('%s','yyyy-MM-dd HH24:mi:ss')  ", beginStr));
+    	        sql.append(String.format(" and t.alerttime<=to_date('%s','yyyy-MM-dd HH24:mi:ss')  ", endStr));
+
+    	        sql.append(" order by t.alerttime desc");
+
+    	        list = new ArrayList<WarningRecords>(operate.query(String.valueOf(sql), new RowMapper() {
+    	            @Override
+    	            public Object mapRow(ResultSet rs, int arg1) throws SQLException {
+    	                WarningRecords warningRecords = new WarningRecords();
+    	                warningRecords.setId(rs.getInt(1));
+
+    	                warningRecords.setClassName(sdf.format(rs.getTimestamp(2)));
+
+    	                warningRecords.setWarnDesc(rs.getString(3));
+    	                return warningRecords;
+    	            }
+
+    	        }));
+    	        return list;
+    		}
+    	}
+
+        return new ArrayList<WarningRecords>();
+    }
 
-    public Windturbineinfoday getWindTurbineInfoDay(Shutdownevent2 event) {
+    public Windturbineinfoday getWindTurbineInfoDay(Shutdownevent event) {
         String sql = "select * from Windturbineinfoday where windTurbineId='" + event.getWindTurbineId() + "'and recordDate=to_date('" + ToolUtil.toDate1(event.getStartTime()).substring(0, 10) + " 00:00:00" + "','yyyy-mm-dd hh24:mi:ss')";
         // return (Windturbineinfoday) operate.queryForObject(sql, new
         // RowMapper() {
@@ -691,7 +727,7 @@ public class ShutDownEventService extends GenericJdbcDao<Shutdownevent2> {
      * 
      * @param event
      */
-    public void updateWindTurbineInfoDay(Shutdownevent2 event) {
+    public void updateWindTurbineInfoDay(Shutdownevent event) {
         double faultHours = 0;
         double mainHours = 0;
         Windturbineinfoday day = this.getWindTurbineInfoDay(event);
@@ -735,149 +771,4 @@ public class ShutDownEventService extends GenericJdbcDao<Shutdownevent2> {
         return retValue;
     }
 
-    
-    @SuppressWarnings({ "unchecked", "rawtypes" })
-	public List<Map<String,String>> queryStopTypeId(String wtId, Date beginDate, Date endDate) {
-        StringBuilder sb = new StringBuilder();
-        sb.append("select r.windTurbineId,r.stopTypeId,r.stopTime,r.warningId ");
-        sb.append("from Shutdownevent r where 1=1   ");
-        List<Object> objs = new ArrayList<Object>();
-
-        if (StringUtils.notEmp(wtId)) {
-            sb.append(" and r.windTurbineId=? ");
-            objs.add(wtId);
-        }
-
-        sb.append(" and r.stopTime >= ? ");
-        sb.append(" and r.stopTime < ? ");
-        java.sql.Date begin = new java.sql.Date(beginDate.getTime());
-        java.sql.Date end = new java.sql.Date(endDate.getTime());
-        objs.add(begin);
-        objs.add(end);
-
-        sb.append(" order by r.stopTime desc ");
-        
-
-		List<Map<String,String>> list = new ArrayList<Map<String,String>>(operate.query(String.valueOf(sb), objs.toArray(new Object[0]), new RowMapper() {
-
-            @Override
-            public Object mapRow(ResultSet rs, int num) throws SQLException {
-            	Map<String,String> map=new HashMap<String, String>();
-            	map.put("stopTypeId", rs.getString("stopTypeId"));
-            	map.put("windTurbineId", rs.getString("windTurbineId"));
-            	map.put("stopTime", DateUtils.toDate(rs.getTimestamp("stopTime")));
-            	
-            	if(StringUtils.notEmp(rs.getString("warningId")) && CacheContext.warnmap.containsKey(rs.getString("warningId")))
-            	{
-            		map.put("warningId", CacheContext.warnmap.get(rs.getString("warningId")).getChinesetext());
-            	}else
-            	{
-            		map.put("warningId", " ");
-            	}
-            	
-                return map;
-            }
-
-        }));
-        return (List) list;
-    }
-    
-    @SuppressWarnings("unchecked")
-    public List<ShutdowneventVo> queryStopTop10(String wtId) {
-        StringBuilder sb = new StringBuilder();
-        sb.append("select ROW_NUMBER() Over(order by r.stopTime desc) num, ");
-        sb.append(" r.warningId,w.chinesetext,r.stopTime,r.startTime,r.stopHours,r.lossPower ");
-        sb.append(" from Shutdownevent r,Warning w where 1=1 and r.warningId=w.id ");
-        List<Object> objs = new ArrayList<Object>();
-
-        Calendar cal = Calendar.getInstance();
-		cal.set(Calendar.HOUR_OF_DAY, 0);
-		cal.set(Calendar.MINUTE, 0);
-		cal.set(Calendar.SECOND, 0);
-
-		Date endDate = cal.getTime();
-		cal.add(Calendar.YEAR, -1);
-		Date beginDate = cal.getTime();
-        if (StringUtils.notEmp(wtId)) {
-            sb.append(" and r.windTurbineId=? ");
-            objs.add(wtId);
-        }
-        
-        sb.append(" and r.stopTime >=to_date('").append(format.format(beginDate)).append("','YYYY-MM-DD HH24:MI:SS')");
-        sb.append(" and r.stopTime <=to_date('").append(format.format(endDate)).append("','YYYY-MM-DD HH24:MI:SS')");
-       
-        sb.append(" order by r.stopTime desc");
-        String sql = "select * from (" + sb.toString() + ") t where num<=10";
-
-        List<ShutdowneventVo> list = new ArrayList<ShutdowneventVo>(operate.query(sql, objs.toArray(new Object[0]), new RowMapper() {
-
-            @Override
-            public Object mapRow(ResultSet rs, int num) throws SQLException {
-                ShutdowneventVo event = new ShutdowneventVo();
-                event.setWarningId(rs.getString("warningId"));
-                event.setWarnDesc(rs.getString("chinesetext"));
-                event.setStartTime(rs.getTimestamp("startTime"));
-                event.setStopTime(rs.getTimestamp("stopTime"));
-                event.setStopHours(rs.getDouble("stopHours"));
-                event.setLossPower(rs.getDouble("lossPower"));
-
-                return event;
-            }
-
-        }));
-        return (List) list;
-    }
-    
-  
-    
-    @SuppressWarnings("unchecked")
-    public List<ShutdowneventVo> queryStopTopByType(String wtId,String type) {
-        StringBuilder sb = new StringBuilder();
-        sb.append("select ROW_NUMBER() Over(order by r.stopTime desc) num, ");
-        sb.append(" w.chinesetext,r.stopTime,r.startTime,r.stopHours,r.lossPower,w.warningtypeid ");
-        sb.append(" from Shutdownevent r,Warning w,warningtype t where 1=1 and r.warningId=w.id and w.warningtypeid=t.id ");
-        List<Object> objs = new ArrayList<Object>();
-
-        Calendar cal = Calendar.getInstance();
-		cal.set(Calendar.HOUR_OF_DAY, 0);
-		cal.set(Calendar.MINUTE, 0);
-		cal.set(Calendar.SECOND, 0);
-
-		Date endDate = cal.getTime();
-		cal.add(Calendar.YEAR, -2);
-		Date beginDate = cal.getTime();
-        if (StringUtils.notEmp(wtId)) {
-            sb.append(" and r.windTurbineId=? ");
-            objs.add(wtId);
-        }
-        
-        sb.append(" and r.stopTime >=to_date('").append(format.format(beginDate)).append("','YYYY-MM-DD HH24:MI:SS')");
-        sb.append(" and r.stopTime <=to_date('").append(format.format(endDate)).append("','YYYY-MM-DD HH24:MI:SS')");
-        
-        sb.append(" and t.unit ='").append(type).append("' ");
-        
-    
-        sb.append(" order by  r.stopTime desc");
-       
-
-        String sql = "select * from (" + sb.toString() + ") t where num<=1";
-
-        List<ShutdowneventVo> list = new ArrayList<ShutdowneventVo>(operate.query(sql, objs.toArray(new Object[0]), new RowMapper() {
-
-            @Override
-            public Object mapRow(ResultSet rs, int num) throws SQLException {
-                ShutdowneventVo event = new ShutdowneventVo();
-                event.setWarningId(rs.getString("warningtypeid"));
-                event.setWarnDesc(rs.getString("chinesetext"));
-                event.setStartTime(rs.getTimestamp("startTime"));
-                event.setStopTime(rs.getTimestamp("stopTime"));
-                event.setStopHours(rs.getDouble("stopHours"));
-                event.setLossPower(rs.getDouble("lossPower"));
-
-                return event;
-            }
-
-        }));
-        return (List) list;
-    }
 }