From e051f5c497e691bcd97c81dffa97f7946fd197b1 Mon Sep 17 00:00:00 2001
From: hdw <496960745@qq.com>
Date: 星期二, 06 十一月 2018 16:32:24 +0800
Subject: [PATCH] Merge branch 'dev_lxw' of https://whychdw@gitlab.com/whyclxw1/gx_tieta.git into dev_lxw
---
gx_tieta/src/com/fgkj/services/Battalarm_dataService.java | 26 +++++++++++++++++++++++++-
1 files changed, 25 insertions(+), 1 deletions(-)
diff --git a/gx_tieta/src/com/fgkj/services/Battalarm_dataService.java b/gx_tieta/src/com/fgkj/services/Battalarm_dataService.java
index e110b81..8592d42 100644
--- a/gx_tieta/src/com/fgkj/services/Battalarm_dataService.java
+++ b/gx_tieta/src/com/fgkj/services/Battalarm_dataService.java
@@ -458,7 +458,31 @@
}
return model;
}
-
+ //鍛婅鍙戝０(30绉掍箣鍐呯殑鍛婅)
+ public ServiceModel serchIn30(Object obj){
+ List<Battalarm_data> lista=((Battalarm_dataDAOImpl)dao).serchIn30(obj);
+ List<Batt_devalarm_data> listd=(new Batt_devalarm_dataImpl()).serchIn30(obj);
+ if(listd!=null&&listd.size()>0){
+ for (Batt_devalarm_data ddata : listd) {
+ Battalarm_data data=new Battalarm_data();
+ data.setAlm_id(ddata.getDev_id());
+ data.setNote(ddata.getNote());
+ data.setNum(ddata.getNum());//1琛ㄧず璁惧鍛婅
+ data.setAlm_start_time(ddata.getAlm_start_time());
+ data.setAlm_signal_id(ddata.getAlm_type());
+ lista.add(data);
+ }
+ }
+ if(lista!=null&&lista.size()>0){
+ model.setCode(1);
+ model.setData(lista);
+ model.setMsg("鏌ヨ鎴愬姛!");
+ }else{
+ model.setCode(0);
+ model.setMsg("鏌ヨ澶辫触!");
+ }
+ return model;
+ }
//鐐瑰嚮椤圭洰涓嬫柟鐨勬粴鍔紝鏌ヨ璇ユ潯鍛婅鐨勫疄鏃朵俊鎭�
public ServiceModel serchBatt_alarm(Object obj){
List list=((Battalarm_dataDAOImpl)dao).serchBatt_alarm(obj);
--
Gitblit v1.9.1