From 90c69565afd02dba9e79aff9de30b4ca322e5fb8 Mon Sep 17 00:00:00 2001
From: 81041 <81041@DESKTOP-025NVD9>
Date: 星期二, 08 一月 2019 14:47:28 +0800
Subject: [PATCH] 线程启动
---
gx_tieta/src/com/fgkj/services/Battalarm_dataService.java | 25 +++++++++++++++++++------
1 files changed, 19 insertions(+), 6 deletions(-)
diff --git a/gx_tieta/src/com/fgkj/services/Battalarm_dataService.java b/gx_tieta/src/com/fgkj/services/Battalarm_dataService.java
index 517783f..958707c 100644
--- a/gx_tieta/src/com/fgkj/services/Battalarm_dataService.java
+++ b/gx_tieta/src/com/fgkj/services/Battalarm_dataService.java
@@ -176,13 +176,28 @@
//3.1鐢垫睜鍛婅瀹炴椂鏌ヨ
public ServiceModel serchByCondition(Object obj){
model=new ServiceModel();
- List<Batt_Maint_Dealarm> list=dao.serchByCondition(obj);
+ List list=dao.serchByCondition(obj);
if(list!=null && list.size()>1){
model.setCode(1);
model.setData(list);
}else {
model.setCode(0);
model.setData(list);
+ }
+ return model;
+ }
+ //3.1鐢垫睜鍛婅瀹炴椂鏌ヨ<***********璺ㄥ煙涓撶敤**************>
+ public ServiceModel serchByCondition_ky(Object obj){
+ model=new ServiceModel();
+ List list=((Battalarm_dataDAOImpl)dao).serchByCondition_ky(obj);
+ if(list!=null && list.size()>1){
+ model.setCode(1);
+ model.setData(list);
+ model.setMsg("鏌ヨ鎴愬姛!");
+ }else {
+ model.setCode(0);
+ model.setData(list);
+ model.setMsg("鏌ヨ澶辫触!");
}
return model;
}
@@ -225,9 +240,8 @@
}
- //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);//瀹归噺鍛婅鍛婅鏁�
@@ -240,10 +254,9 @@
adata.setUsr_Id(0);//杩炴帴鏉￠樆鎶楀憡璀︽暟
adata.setAlm_value(0f);//瀹归噺鏇存崲鍛婅
adata.setRecord_Id(0l);//鍦ㄧ嚎鐢靛帇鍛婅鏁�
- bmd.setAdata(adata);
int numZ=0;//鍛婅鎬绘暟
//姹傚叓绉嶇被鍨嬪憡璀︾殑鏁伴噺
- List<Battalarm_data> list=((Battalarm_dataDAOImpl)dao).serchAlm(bmd);
+ List<Battalarm_data> list=((Battalarm_dataDAOImpl)dao).serchAlm(obj);
if(list!=null&&list.size()>0){
for(int i=0;i<list.size();i++){
if(list.get(i).getAlm_id()==AlarmDaoFactory.Alarm_CapAlarm){
@@ -582,7 +595,7 @@
//System.out.println(bmd);
//bs.serchByCondition(bmd);
//bs.serchByInfo(bmd);
- bs.serchAlm(bmd);
+ bs.serchAlm(uinf);
//bs.serchGood();
//bs.serchTopAlmTen(uinf);
}
--
Gitblit v1.9.1