From 35fefed0792c40cb99b8d15fa5811bbb5992bff9 Mon Sep 17 00:00:00 2001
From: D:/workspace/chenjingjing/git/gx_tieta/gx_tieta/.gitignore <chenjingjing@LAPTOP-E51P2139>
Date: 星期一, 21 一月 2019 10:42:24 +0800
Subject: [PATCH] 修改

---
 gx_tieta/src/com/fgkj/actions/ram/Fbs9100_stateAction.java |   37 ++++++++++++++++++++++++++++++++++++-
 1 files changed, 36 insertions(+), 1 deletions(-)

diff --git a/gx_tieta/src/com/fgkj/actions/ram/Fbs9100_stateAction.java b/gx_tieta/src/com/fgkj/actions/ram/Fbs9100_stateAction.java
index e7e632c..a303de8 100644
--- a/gx_tieta/src/com/fgkj/actions/ram/Fbs9100_stateAction.java
+++ b/gx_tieta/src/com/fgkj/actions/ram/Fbs9100_stateAction.java
@@ -2,6 +2,8 @@
 
 import java.util.List;
 
+import javax.servlet.http.HttpServletResponse;
+
 import com.fgkj.actions.ActionUtil;
 import com.fgkj.dto.BattInf;
 import com.fgkj.dto.ServiceModel;
@@ -93,13 +95,46 @@
 		result = tojson(model);
 		return SUCCESS;	
   	}
-   //瀵艰埅涓婂疄鏃舵煡璇�61850璁惧鐨勫浜庢牳瀹规祴璇曠殑鏁版嵁
+    //瀵艰埅涓婂疄鏃舵煡璇�61850璁惧鐨勫浜庢牳瀹规祴璇曠殑鏁版嵁
   	public String seach6185Nuclear_cap(){
 		User_inf uinf=(User_inf) getUser();
   		ServiceModel model = service.seach6185Nuclear_cap(uinf);
 		result = tojson(model);
 		return SUCCESS;	
   	}
+  //瀵艰埅涓婂疄鏃舵煡璇ts澶勪簬鏀剧數娴嬭瘯鐨勬暟鎹殑璁惧
+  	public String seachNuclear_cap(){
+		User_inf uinf=(User_inf) getUser();
+  		ServiceModel model = service.seachNuclear_cap(uinf);
+		result = tojson(model);
+		return SUCCESS;	
+  	}
+  //鎵归噺璁剧疆鏀剧數鍙傛暟鏃舵煡璇㈠嚭褰撳墠鏀剧數鐨勭數姹犵粍锛�1u/2u鍒嗗紑锛�
+  	public String seachDischarge(){
+  		BattInf binf=getGson().fromJson(json, BattInf.class);
+		User_inf uinf=(User_inf) getUser();
+		binf.setBattGroupId(uinf.getUId());
+  		ServiceModel model = service.seachDischarge(binf);
+		result = tojson(model);
+		return SUCCESS;	
+  	}
+  //瀹炴椂鍒锋柊鎵归噺璁剧疆鏀剧數鍙傛暟
+  	public String freshenDischarge(){
+  		List list=getGson().fromJson(json,new TypeToken<List<BattInf>>(){}.getType());
+  		ServiceModel model = service.freshenDischarge(list);
+		result = tojson(model);
+		return SUCCESS;	
+  	}
+   //11.1FBS9100璁惧閫氫俊鐘舵�佹煡璇� 				<--     璺ㄥ煙    -->
+  	public String serchByCondition_ky(){  		
+  		//isAllowHeaders();												//鍏佽璺ㄥ煙璁块棶
+  		ServiceModel model = new ServiceModel();
+		model = service.serchByCondition_ky();  			
+  		result = tojson(model);
+  		return SUCCESS;	
+  	}
+  	
+  	
 	public String getResult() {
 		return result;
 	}

--
Gitblit v1.9.1