From c02e430f16cb51cabb6f4b24f99ec48efc7b0596 Mon Sep 17 00:00:00 2001
From: Administrator <Administrator@192.168.10.26>
Date: 星期三, 21 十一月 2018 11:59:20 +0800
Subject: [PATCH] Merge branch 'dev_lxw' of https://whyccjj@gitlab.com/whyclxw1/gx_tieta.git into dev_lxw
---
gx_tieta/src/com/fgkj/actions/ram/Bts_station_stateAction.java | 20 ++++++++++++++++++--
1 files changed, 18 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 3f890b4..d3a110f 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{
@@ -10,14 +11,29 @@
private String json;
private String result;
//鏌ヨ鏈烘埧瀹炴椂鐘舵��
- private String serchByCondition(){
+ 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;
+ }
--
Gitblit v1.9.1