From 512733908ae4f3a851f40f0551724d2186ce56ec Mon Sep 17 00:00:00 2001
From: 81041 <81041@192.168.10.26>
Date: 星期四, 13 十二月 2018 11:20:11 +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/ram/Bts_station_stateAction.java | 26 ++++++++++++++++++++++++--
1 files changed, 24 insertions(+), 2 deletions(-)
diff --git a/gx_tieta/src/com/fgkj/actions/ram/Bts_station_stateAction.java b/gx_tieta/src/com/fgkj/actions/ram/Bts_station_stateAction.java
index d9b5ec5..7537c98 100644
--- a/gx_tieta/src/com/fgkj/actions/ram/Bts_station_stateAction.java
+++ b/gx_tieta/src/com/fgkj/actions/ram/Bts_station_stateAction.java
@@ -3,6 +3,7 @@
import com.fgkj.actions.ActionUtil;
import com.fgkj.dto.BattInf;
import com.fgkj.dto.ServiceModel;
+import com.fgkj.dto.User_inf;
import com.fgkj.services.ram.Bts_station_stateService;
public class Bts_station_stateAction extends ActionUtil{
@@ -12,13 +13,34 @@
//鏌ヨ鏈烘埧瀹炴椂鐘舵��
public String serchByCondition(){
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.serchByCondition(binf);
result=tojson(model);
return SUCCESS;
}
+ //鏌ヨ褰撳墠鏈烘埧鍋滅數鏁�
+ public String serchByState(){
+ User_inf uinf=(User_inf) getUser();
+ ServiceModel model=service.serchByState(uinf);
+ result=tojson(model);
+ return SUCCESS;
+ }
-
-
+ //鏈烘埧鏂數缁熻(棣栭〉涓婄殑楗肩姸鍥�)
+ public String serchPowerOff(){
+ User_inf uinf=(User_inf) ActionUtil.getUser();
+ ServiceModel model = service.serchPowerOff(uinf);
+ result = tojson(model);
+ return SUCCESS;
+ }
+ //鍦板浘鍙充笅瑙掓樉绀哄嚭宸插畨瑁呮満鎴夸腑(鍋滅數鏁�/鎺夌珯鏁�/鏈烘埧鍛婅鏁�/钀藉悗鍗曚綋鏈烘埧鏁�)
+ public String serchStationState(){
+ User_inf uinf=(User_inf) ActionUtil.getUser();
+ ServiceModel model = service.serchStationState(uinf);
+ result = tojson(model);
+ return SUCCESS;
+ }
--
Gitblit v1.9.1