From 592720573d6b194bbac25b25b6c619376cb9c0a4 Mon Sep 17 00:00:00 2001
From: hdw <496960745@qq.com>
Date: 星期四, 13 十二月 2018 13:38:34 +0800
Subject: [PATCH] 修改电池查询面板中正则的验证
---
gx_tieta/src/com/fgkj/actions/BattInfAction.java | 144 ++++++++++++++++++++++++++++++++++++++++++++----
1 files changed, 132 insertions(+), 12 deletions(-)
diff --git a/gx_tieta/src/com/fgkj/actions/BattInfAction.java b/gx_tieta/src/com/fgkj/actions/BattInfAction.java
index 5c91a30..833b60f 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;
@@ -57,6 +59,13 @@
result = tojson(model);
return SUCCESS;
}
+ //璁剧疆鐢垫睜缁勫厖鐢电數娴侀槇鍊�
+ public String update_charge() {
+ BattInf binf= getGson("yyyy-MM-dd").fromJson(json, BattInf.class);
+ ServiceModel model = service.update_charge(binf);
+ result = tojson(model);
+ return SUCCESS;
+ }
//鍒犻櫎鐢垫睜缁�
public String delete() {
List<BattInf> list= getGson("yyyy-MM-dd").fromJson(json, new TypeToken<List<BattInf>>(){}.getType());
@@ -71,13 +80,28 @@
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;
+ }
public String serchByCondition() {
model = service.serchByCondition(bif);
result = ActionUtil.tojson(model);
//System.out.println(result);
return SUCCESS;
}
-
+
+ //娣诲姞鎿嶄綔鏃舵煡璇㈠嚭璁惧id
+ public String searchmaxdev_id(){
+ model = service.searchmaxdev_id();
+ result = ActionUtil.tojson(model);
+ return SUCCESS;
+ }
+
+
public String searchAll() {
model = service.searchAll();
result = ActionUtil.tojson(model);
@@ -242,9 +266,6 @@
result = ActionUtil.tojson(model);
return SUCCESS;
}
-
-
-
//鎼滅储鏈烘埧鎴栫數姹犵粍
public String serchStationOrBattgroup(){
BattInf binf = ActionUtil.getGson().fromJson(json, BattInf.class);
@@ -261,6 +282,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();
@@ -270,7 +300,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);
@@ -279,10 +332,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;
}
@@ -295,6 +366,61 @@
return SUCCESS;
}
+ //鐢垫睜閰嶇粍绠＄悊(閲嶈)
+ 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(){
+ //isAllowHeaders(); //鍏佽璺ㄥ煙璁块棶
+ ServiceModel model = new ServiceModel();
+ model = service.searchInform_ky();
+ result = ActionUtil.tojson(model);
+ return SUCCESS;
+ }
+ //棣栭〉涓婃樉绀哄凡瀹夎鏁板拰鍏ㄩ儴鍩虹珯鏁�
+ public String serchDevice(){
+ User_inf uinf=(User_inf) getUser();
+ ServiceModel model = service.serchDevice(uinf);
+ result = ActionUtil.tojson(model);
+ return SUCCESS;
+ }
+ //澶撮儴鏌ュ嚭宸插畨瑁呯殑鎵�鏈夋満鎴�
+ public String serchByDeviceId(){
+ User_inf uinf=(User_inf) getUser();
+ ServiceModel model = service.serchByDeviceId(uinf);
+ result = ActionUtil.tojson(model);
+ return SUCCESS;
+ }
+ //澶撮儴鏌ュ嚭宸插畨瑁呯殑鐢垫睜鍗曚綋
+ public String serchByInstall_count(){
+ User_inf uinf=(User_inf) getUser();
+ ServiceModel model = service.serchByInstall_count(uinf);
+ result = ActionUtil.tojson(model);
+ return SUCCESS;
+ }
public BattInf getBif() {
return bif;
}
@@ -328,12 +454,6 @@
this.btdif = btdif;
}
-
-
-// public ServiceModel getModel() {
-// return model;
-// }
-
public void setJson(String json) {
this.json = json;
--
Gitblit v1.9.1