From a6b4c1e19b3b3fdcf80d7f69f20fe406205fcf8f Mon Sep 17 00:00:00 2001
From: LiJun <LiJun@192.168.10.20>
Date: 星期一, 26 十一月 2018 11:54:39 +0800
Subject: [PATCH] Merge branch 'dev_lxw' of https://whyclj@gitlab.com/whyclxw1/gx_tieta.git into dev_lxw
---
gx_tieta/src/com/fgkj/services/Battalarm_dataService.java | 53 +++++++++++++++++++++++++++++++++++++++++------------
1 files changed, 41 insertions(+), 12 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..efcd26d 100644
--- a/gx_tieta/src/com/fgkj/services/Battalarm_dataService.java
+++ b/gx_tieta/src/com/fgkj/services/Battalarm_dataService.java
@@ -27,6 +27,7 @@
import com.fgkj.dto.Batttestdata_inf;
import com.fgkj.dto.Page;
import com.fgkj.dto.ServiceModel;
+import com.fgkj.dto.User;
import com.fgkj.dto.User_inf;
import com.fgkj.dto.User_log;
@@ -224,12 +225,12 @@
}
- //0.5鏌ヨ瀹炴椂鍛婅鏁�
+ //0.5鏌ヨ瀹炴椂鍛婅鏁�(鐢垫睜鍛婅鐜�)
public ServiceModel serchAlm(Object obj){
Batt_Maint_Dealarm bmd=(Batt_Maint_Dealarm) obj;
Battalarm_data adata=new Battalarm_data();
adata.setNum(0);//瀹炴椂鍛婅鎬绘暟
- adata.setBattGroupId(0);//瀹归噺鍛婅鍛婅鏁�
+ //adata.setBattGroupId(0);//瀹归噺鍛婅鍛婅鏁�
adata.setMonNum(0);//缁勭鐢靛帇鍛婅鏁�
adata.setAlm_id(0);//鍏呯數鐢垫祦鍛婅鏁�
adata.setAlm_signal_id(0);//鏀剧數鐢垫祦鍛婅鏁�
@@ -237,18 +238,18 @@
adata.setAlm_is_confirmed(0);//鍗曚綋娓╁害鍛婅鏁�
adata.setAlm_cleared_type(0);//鍗曚綋鍐呴樆鍛婅鏁�
adata.setUsr_Id(0);//杩炴帴鏉￠樆鎶楀憡璀︽暟
- adata.setAlm_value(0f);//瀹归噺鏇存崲鍛婅
-
+ //adata.setAlm_value(0f);//瀹归噺鏇存崲鍛婅
+ adata.setRecord_Id(0l);//鍦ㄧ嚎鐢靛帇鍛婅鏁�
bmd.setAdata(adata);
int numZ=0;//鍛婅鎬绘暟
//姹傚叓绉嶇被鍨嬪憡璀︾殑鏁伴噺
List<Battalarm_data> list=((Battalarm_dataDAOImpl)dao).serchAlm(bmd);
if(list!=null&&list.size()>0){
for(int i=0;i<list.size();i++){
- if(list.get(i).getAlm_id()==AlarmDaoFactory.Alarm_CapAlarm){
+ /*if(list.get(i).getAlm_id()==AlarmDaoFactory.Alarm_CapAlarm){
adata.setBattGroupId(list.get(i).getNum());//瀹归噺鍛婅鍛婅鏁�
numZ+=list.get(i).getNum();
- }
+ }*/
if(list.get(i).getAlm_id()==AlarmDaoFactory.Alarm_vol_Group){
adata.setMonNum(list.get(i).getNum());//缁勭鐢靛帇鍛婅鏁�
numZ+=list.get(i).getNum();
@@ -277,8 +278,11 @@
adata.setUsr_Id(list.get(i).getNum());//杩炴帴鏉￠樆鎶楀憡璀︽暟
numZ+=list.get(i).getNum();
}
- if(list.get(i).getAlm_id()==AlarmDaoFactory.Alarm_CapChange){
+ /*if(list.get(i).getAlm_id()==AlarmDaoFactory.Alarm_CapChange){
adata.setAlm_value((float)list.get(i).getNum());//瀹归噺鏇存崲鍛婅鏁�
+ numZ+=list.get(i).getNum();
+ }*/if(list.get(i).getAlm_id()==AlarmDaoFactory.Alarm_vol_Online){
+ adata.setRecord_Id((long)list.get(i).getNum());//鍦ㄧ嚎鐢靛帇鍛婅鏁�
numZ+=list.get(i).getNum();
}
@@ -458,7 +462,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);
@@ -542,20 +570,21 @@
tdata.setRecord_time(ActionUtil.getSimpDate(date1));
tdata.setRecord_time1(ActionUtil.getSimpDate(date2));
+ User_inf uinf=new User_inf();
+ uinf.setUId(1002);
Batt_Maint_Dealarm bmd = new Batt_Maint_Dealarm();
bmd.setPage(p);
bmd.setAdata(adata);
bmd.setMainf(mainf);
bmd.setBinf(binf);
bmd.setTdata(tdata);
+ bmd.setUinf(uinf);
//System.out.println(bmd);
//bs.serchByCondition(bmd);
//bs.serchByInfo(bmd);
- //.serchAlm(bmd);
+ bs.serchAlm(bmd);
//bs.serchGood();
- User_inf uinf=new User_inf();
- uinf.setUId(1038);
- bs.serchTopAlmTen(uinf);
+ //bs.serchTopAlmTen(uinf);
}
}
--
Gitblit v1.9.1