From 99285fcc7d30e62f1e84e1c96d29d0ffcd9ccdbc Mon Sep 17 00:00:00 2001
From: 81041 <81041@192.168.10.30>
Date: 星期三, 14 十一月 2018 17:33:27 +0800
Subject: [PATCH] Merge branch 'dev_lxw' of https://whyclxw1@gitlab.com/whyclxw1/gx_tieta.git into dev_lxw
---
gx_tieta/src/com/fgkj/actions/BattInfAction.java | 91 ++++++++++++++++++++++++++++++++++++++++++++-
1 files changed, 89 insertions(+), 2 deletions(-)
diff --git a/gx_tieta/src/com/fgkj/actions/BattInfAction.java b/gx_tieta/src/com/fgkj/actions/BattInfAction.java
index 89b44ee..5cf8ab1 100644
--- a/gx_tieta/src/com/fgkj/actions/BattInfAction.java
+++ b/gx_tieta/src/com/fgkj/actions/BattInfAction.java
@@ -2,6 +2,8 @@
import java.util.List;
+import javax.servlet.http.HttpServletResponse;
+
import com.fgkj.dao.impl.BattInfImpl;
import com.fgkj.dto.BattInf;
import com.fgkj.dto.Batt_Maint_Dealarm;
@@ -68,6 +70,13 @@
public String searchInform() {
Batt_Maint_Dealarm bmd = getGson().fromJson(json, Batt_Maint_Dealarm.class);
ServiceModel model = service.searchInform(bmd);
+ result = tojson(model);
+ return SUCCESS;
+ }
+ //鏍规嵁缁存姢鍖哄拰鏈烘埧鍚嶇О鏌ヨ鐢垫睜缁勪俊鎭�
+ public String searchInform1() {
+ Batt_Maint_Dealarm bmd = getGson().fromJson(json, Batt_Maint_Dealarm.class);
+ ServiceModel model = service.searchInform1(bmd);
result = tojson(model);
return SUCCESS;
}
@@ -258,6 +267,15 @@
result = ActionUtil.tojson(model);
return SUCCESS;
}
+ //鏌ヨ鎵�鏈夌殑鐪佷唤(宸︿晶瀵艰埅绗竴灞傦紝鏌ユ墍鏈夌殑鐪佷唤)
+ public String serchAllStation_all(){
+ User_inf u = (User_inf)getUser();
+ BattInf binf=new BattInf();
+ binf.setNum(u.getUId());
+ ServiceModel model = service.serchAllStation_all(binf);
+ result = ActionUtil.tojson(model);
+ return SUCCESS;
+ }
//鏌ヨ绠＄悊鐨勫競(宸︿晶瀵艰埅绗簩灞傦紝鏌ユ墍鏈夌殑甯�,num涓瓨鏀緐id)
public String serchStationName2(){
User_inf u = (User_inf)getUser();
@@ -267,7 +285,30 @@
result = ActionUtil.tojson(model);
return SUCCESS;
}
- //鏌ヨ绠＄悊鐨勬満鎴�(宸︿晶瀵艰埅绗笁灞傦紝鏌ユ墍鏈夌殑鏈烘埧,num涓瓨鏀緐id)
+ //鏌ヨ绠＄悊鐨勫競(宸︿晶瀵艰埅绗簩灞傦紝鏌ユ墍鏈夌殑甯�)
+ public String serchStationName2_all(){
+ BattInf binf = ActionUtil.getGson().fromJson(json, BattInf.class);
+ ServiceModel model = service.serchStationName2_all(binf);
+ result = ActionUtil.tojson(model);
+ return SUCCESS;
+ }
+ //鏌ヨ绠＄悊鐨勫幙/鍖�(宸︿晶瀵艰埅绗笁灞傦紝鏌ユ墍鏈夌殑鍘�/鍖�)
+ public String serchStationName5(){
+ User_inf u = (User_inf)getUser();
+ BattInf binf = ActionUtil.getGson().fromJson(json, BattInf.class);
+ binf.setNum(u.getUId());
+ ServiceModel model = service.serchStationName5(binf);
+ result = ActionUtil.tojson(model);
+ return SUCCESS;
+ }
+ //鏌ヨ绠＄悊鐨勫幙/鍖�(宸︿晶瀵艰埅绗笁灞傦紝鏌ユ墍鏈夌殑鍘�/鍖�)
+ public String serchStationName5_all(){
+ BattInf binf = ActionUtil.getGson().fromJson(json, BattInf.class);
+ ServiceModel model = service.serchStationName5_all(binf);
+ result = ActionUtil.tojson(model);
+ return SUCCESS;
+ }
+ //鏌ヨ绠＄悊鐨勬満鎴�(宸︿晶瀵艰埅绗洓灞傦紝鏌ユ墍鏈夌殑鏈烘埧,num涓瓨鏀緐id)
public String serchStationName3(){
User_inf u = (User_inf)getUser();
BattInf binf = ActionUtil.getGson().fromJson(json, BattInf.class);
@@ -276,13 +317,28 @@
result = ActionUtil.tojson(model);
return SUCCESS;
}
- //鏍规嵁鏈烘埧id鏌ヨ鏈烘埧涓嬬殑鐢垫睜缁勪俊鎭�(宸︿晶瀵艰埅绗洓灞�,鏍规嵁鏈烘埧鏌ヨ涓嬮潰鐨勭數姹犵粍,num涓瓨鏀緐id)
+ //鏌ヨ绠＄悊鐨勬満鎴�(宸︿晶瀵艰埅绗洓灞傦紝鏌ユ墍鏈夌殑鏈烘埧)
+ public String serchStationName3_all(){
+ BattInf binf = ActionUtil.getGson().fromJson(json, BattInf.class);
+ ServiceModel model = service.serchStationName3_all(binf);
+ result = ActionUtil.tojson(model);
+ return SUCCESS;
+ }
+ //鏍规嵁鏈烘埧id鏌ヨ鏈烘埧涓嬬殑鐢垫睜缁勪俊鎭�(宸︿晶瀵艰埅绗簲灞�,鏍规嵁鏈烘埧鏌ヨ涓嬮潰鐨勭數姹犵粍,num涓瓨鏀緐id)
public String serchBattByStation(){
BattInf binf = ActionUtil.getGson().fromJson(json, BattInf.class);
User_inf u = (User_inf)getUser();
binf.setNum(u.getUId());
//System.out.println(binf);
ServiceModel model = service.serchBattByStation(binf);
+ result = ActionUtil.getGson("yyyy-MM-dd HH:mm:ss").toJson(model);
+ return SUCCESS;
+ }
+ //鏍规嵁鏈烘埧id鏌ヨ鏈烘埧涓嬬殑鐢垫睜缁勪俊鎭�(宸︿晶瀵艰埅绗簲灞�,鏍规嵁鏈烘埧鏌ヨ涓嬮潰鐨勭數姹犵粍)
+ public String serchBattByStation_all(){
+ BattInf binf = ActionUtil.getGson().fromJson(json, BattInf.class);
+ //System.out.println(binf);
+ ServiceModel model = service.serchBattByStation_all(binf);
result = ActionUtil.getGson("yyyy-MM-dd HH:mm:ss").toJson(model);
return SUCCESS;
}
@@ -298,10 +354,41 @@
//鐢垫睜閰嶇粍绠＄悊(閲嶈)
public String serchMakeGroup(){
BattInf binf=getGson("yyyy-MM-dd HH:mm:ss").fromJson(json, BattInf.class);
+ User_inf uinf=(User_inf) getUser();
+ binf.setNum(uinf.getUId());
ServiceModel model = service.serchMakeGroup(binf);
result = ActionUtil.tojson(model);
return SUCCESS;
}
+ //鐢垫睜閰嶇粍绠＄悊(閲嶈)
+ public String serchGroupByInfor(){
+ BattInf binf=getGson("yyyy-MM-dd HH:mm:ss").fromJson(json, BattInf.class);
+ User_inf uinf=(User_inf) getUser();
+ binf.setNum(uinf.getUId());
+ ServiceModel model = service.serchGroupByInfor(binf);
+ result = ActionUtil.tojson(model);
+ return SUCCESS;
+ }
+ //棣栭〉涓婃牴鎹畇tationid鏌ヨ鐢垫睜缁勭殑鏈哄巻鍗�
+ public String serchBattAllInfoByStationId(){
+ BattInf binf=getGson("yyyy-MM-dd HH:mm:ss").fromJson(json, BattInf.class);
+ ServiceModel model = service.serchBattAllInfoByStationId(binf);
+ result = ActionUtil.tojson(model);
+ return SUCCESS;
+ }
+
+ //璺ㄥ煙璁块棶鑾峰彇鎵�鏈夌數姹犵粍鐨勪俊鎭�<-------璺ㄥ煙----------->
+ public String searchInform_ky(){
+ HttpServletResponse res = ActionUtil.getResponse();
+ res.setHeader("Access-Control-Allow-Origin", "*"); //鍏佽璺ㄥ煙璁块棶
+ res.setHeader("Access-Control-Allow-Headers", "X-Requested-With,content-type,token");
+ res.setHeader("Access-Control-Allow-Methods", "GET, HEAD, POST, PUT, DELETE, TRACE, OPTIONS, PATCH");
+ ServiceModel model;
+ model = service.searchInform_ky();
+ result = ActionUtil.tojson(model);
+ return SUCCESS;
+ }
+
public BattInf getBif() {
return bif;
}
--
Gitblit v1.9.1