From 01f4050c3529f85ec05673fea9273f35c6e5e934 Mon Sep 17 00:00:00 2001
From: 81041 <81041@192.168.10.30>
Date: 星期三, 05 十二月 2018 14:04:40 +0800
Subject: [PATCH] 电池实时告警跨域访问和电池实时状态加续航停止时间

---
 gx_tieta/src/com/fgkj/actions/Battalarm_dataAction.java |    9 ++++++++-
 1 files changed, 8 insertions(+), 1 deletions(-)

diff --git a/gx_tieta/src/com/fgkj/actions/Battalarm_dataAction.java b/gx_tieta/src/com/fgkj/actions/Battalarm_dataAction.java
index 902fcfd..48d6397 100644
--- a/gx_tieta/src/com/fgkj/actions/Battalarm_dataAction.java
+++ b/gx_tieta/src/com/fgkj/actions/Battalarm_dataAction.java
@@ -5,6 +5,7 @@
 
 import com.fgkj.dao.impl.BattInfImpl;
 import com.fgkj.dao.impl.Battalarm_dataDAOImpl;
+import com.fgkj.dto.BattInf;
 import com.fgkj.dto.Batt_Maint_Dealarm;
 import com.fgkj.dto.Battalarm_data;
 import com.fgkj.dto.RoleLimit;
@@ -31,7 +32,13 @@
 		result=ActionUtil.tojson(model);
 		return SUCCESS;
 	}
-	
+	//3.1鐢垫睜鍛婅瀹炴椂鏌ヨ<***********璺ㄥ煙涓撶敤**************>
+	public String serchByCondition_ky(){
+		BattInf binf=ActionUtil.getGson("yyyy-MM-dd HH:mm:ss").fromJson(json, BattInf.class);
+		ServiceModel model=service.serchByCondition_ky(binf);
+		result=ActionUtil.tojson(model);
+		return SUCCESS;
+	}
 	//3.2鐢垫睜鍛婅鍘嗗彶璁板綍鏌ヨ
 	public String serchByInfo(){
 		bmd = ActionUtil.getGson("yyyy-MM-dd HH:mm:ss").fromJson(result, Batt_Maint_Dealarm.class);

--
Gitblit v1.9.1