From dab560a713cf4f7250bb8398578e78c7940d225f Mon Sep 17 00:00:00 2001
From: 81041 <81041@192.168.10.33>
Date: 星期六, 03 十一月 2018 09:51:43 +0800
Subject: [PATCH] 添加用户解决 问题

---
 gx_tieta/src/com/fgkj/services/Deverror_recordService.java |   12 ++++++++++++
 gx_tieta/src/com/fgkj/dao/impl/Deverror_recordImpl.java    |   16 ++++++++++------
 gx_tieta/src/com/fgkj/actions/Deverror_recordAction.java   |    7 +++++++
 gx_tieta/src/com/fgkj/dto/Deverror_record.java             |    8 ++++++++
 4 files changed, 37 insertions(+), 6 deletions(-)

diff --git a/gx_tieta/src/com/fgkj/actions/Deverror_recordAction.java b/gx_tieta/src/com/fgkj/actions/Deverror_recordAction.java
index da79957..ffc7b38 100644
--- a/gx_tieta/src/com/fgkj/actions/Deverror_recordAction.java
+++ b/gx_tieta/src/com/fgkj/actions/Deverror_recordAction.java
@@ -52,6 +52,13 @@
 		result=tojson(model);
 		return SUCCESS;
 	}
+	 //鐢ㄦ埛澶勭悊鐨勭粨鏋�
+	public String update(){
+		Deverror_record dev_record=getGson("yyyy-MM-dd HH:mm:ss").fromJson(json, Deverror_record.class);
+		ServiceModel model=service.update(dev_record);
+		result=tojson(model);
+		return SUCCESS;
+	}
 	//鏍规嵁stationid鏌ヨ璁惧鐨勯棶棰樿褰�
 	public String serchByCondition(){
 		BattInf binf=getGson().fromJson(json, BattInf.class);
diff --git a/gx_tieta/src/com/fgkj/dao/impl/Deverror_recordImpl.java b/gx_tieta/src/com/fgkj/dao/impl/Deverror_recordImpl.java
index 69e293d..e9bc11c 100644
--- a/gx_tieta/src/com/fgkj/dao/impl/Deverror_recordImpl.java
+++ b/gx_tieta/src/com/fgkj/dao/impl/Deverror_recordImpl.java
@@ -26,12 +26,13 @@
    //鐢ㄦ埛鎵嬪姩娣诲姞闂
 	public boolean add(Object obj) {
 		Deverror_record dev_record=(Deverror_record) obj;
-		String sql=" insert into db_battinf.tb_deverror_record(stationId,record_time,error_descript,uid,picture_num ";
-		String endsql=") values(?,?,?,?,?";
+		String sql=" insert into db_battinf.tb_deverror_record(stationId,record_time,error_descript,error_dispose,uid,picture_num ";
+		String endsql=") values(?,?,?,?,?,?";
 		List list=new ArrayList();
 		list.add(dev_record.getStationId());
 		list.add(dev_record.getRecord_time());
 		list.add(dev_record.getError_descript());
+		list.add(dev_record.getError_dispose());
 		list.add(dev_record.getUid());
 		list.add(dev_record.getPicture_num());
 		if(dev_record.getPicture_num()>=1){
@@ -58,10 +59,12 @@
 		boolean bl=DAOHelper.executeUpdatePicture(DBUtil.getConn(), sql, list);
 		return bl;
 	}
-
+    //鐢ㄦ埛澶勭悊鐨勭粨鏋�
 	public boolean update(Object obj) {
-		// TODO Auto-generated method stub
-		return false;
+		Deverror_record dev_record=(Deverror_record) obj;
+		String sql=" update db_battinf.tb_deverror_record set error_dispose=?,error_en=? where num=? ";
+		boolean bl=DAOHelper.executeUpdate(DBUtil.getConn(), sql, new Object[]{dev_record.getError_dispose(),dev_record.getError_en(),dev_record.getNum()});
+		return bl;
 	}
 
 	public boolean del(Object obj) {
@@ -79,7 +82,7 @@
 		Page p=binf.getPage();
 		Connection conn=DBUtil.getConn();
 		String numberSql=" SELECT FOUND_ROWS() number";
-		String sql=" select SQL_CALC_FOUND_ROWS distinct tb_deverror_record.num,tb_deverror_record.stationid,record_time,error_descript,error_en,picture_num " +
+		String sql=" select SQL_CALC_FOUND_ROWS distinct tb_deverror_record.num,tb_deverror_record.stationid,record_time,error_descript,error_en,error_dispose,picture_num " +
 				"  ,db_battinf.tb_battinf.stationname,stationname1,stationname2,stationname3,stationname5 " +
 				"  from db_battinf.tb_deverror_record,db_battinf.tb_battinf " +
 				" where tb_deverror_record.stationid=tb_battinf.stationid " +
@@ -113,6 +116,7 @@
 						dev_record.setRecord_time(rs.getTimestamp("record_time"));
 						dev_record.setError_descript(rs.getString("error_descript"));
 						dev_record.setError_en(rs.getInt("error_en"));
+						dev_record.setError_dispose(rs.getString("error_dispose"));
 						dev_record.setPicture_num(rs.getInt("picture_num"));
 						Page page=new Page();
 						dev_record.setPage(page);
diff --git a/gx_tieta/src/com/fgkj/dto/Deverror_record.java b/gx_tieta/src/com/fgkj/dto/Deverror_record.java
index e92166b..6d1eec5 100644
--- a/gx_tieta/src/com/fgkj/dto/Deverror_record.java
+++ b/gx_tieta/src/com/fgkj/dto/Deverror_record.java
@@ -17,6 +17,7 @@
 	private String stationName5;
 	private Date record_time;
 	private String error_descript;//闂鎻忚堪
+	private String error_dispose;//闂澶勭悊
 	private int uid;
 	private int error_en;         //闂鏄惁瑙e喅
 	private String note;
@@ -166,6 +167,13 @@
 	public void setPicture_num(int picture_num) {
 		this.picture_num = picture_num;
 	}
+	
+	public String getError_dispose() {
+		return error_dispose;
+	}
+	public void setError_dispose(String error_dispose) {
+		this.error_dispose = error_dispose;
+	}
 	@Override
 	public String toString() {
 		return "Deverror_record [num=" + num + ", stationId=" + stationId
diff --git a/gx_tieta/src/com/fgkj/services/Deverror_recordService.java b/gx_tieta/src/com/fgkj/services/Deverror_recordService.java
index 501c1ed..27c7e1e 100644
--- a/gx_tieta/src/com/fgkj/services/Deverror_recordService.java
+++ b/gx_tieta/src/com/fgkj/services/Deverror_recordService.java
@@ -28,6 +28,18 @@
 		}
 		return model;
 	}
+	 //鐢ㄦ埛澶勭悊鐨勭粨鏋�
+	public ServiceModel update(Object obj){
+		boolean bl=dao.update(obj);
+		if (bl) {
+			model.setCode(1);
+			model.setMsg("淇敼鎴愬姛!");
+		} else {
+			model.setCode(0);
+			model.setMsg("淇敼澶辫触!");
+		}
+		return model;
+	}
 	//鏍规嵁stationid鏌ヨ璁惧鐨勯棶棰樿褰�
 	public ServiceModel serchByCondition(Object obj){
 		List list=dao.serchByCondition(obj);

--
Gitblit v1.9.1