From 7d174fc58bcc9c136548c789fbdf350a3c6fe52b Mon Sep 17 00:00:00 2001
From: hdw <496960745@qq.com>
Date: 星期四, 15 十一月 2018 13:11:43 +0800
Subject: [PATCH] Merge branch 'dev_lxw' of https://whychdw@gitlab.com/whyclxw1/gx_tieta.git into dev_lxw
---
gx_tieta/src/com/fgkj/actions/ram/Fbs9100_stateAction.java | 27 ++++++++++++++++++++++++++-
1 files changed, 26 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..3762e11 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,36 @@
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;
+ }
+
+ //11.1FBS9100璁惧閫氫俊鐘舵�佹煡璇� <-- 璺ㄥ煙 -->
+ public String serchByCondition_ky(){
+ isAllowHeaders(); //鍏佽璺ㄥ煙璁块棶
+ ServiceModel model = new ServiceModel();
+ if(key != null && CROSS_DOMAIN_KEY.equals(key)){
+ model = service.serchByCondition_ky();
+ }else{
+ model.setCode(0);
+ model.setMsg("璇嗗埆鐮侀敊璇�");
+ }
+ result = tojson(model);
+ return SUCCESS;
+ }
+
+
public String getResult() {
return result;
}
--
Gitblit v1.9.1