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/BattInfAction.java | 19 ++++++++++++++++++-
1 files changed, 18 insertions(+), 1 deletions(-)
diff --git a/gx_tieta/src/com/fgkj/actions/BattInfAction.java b/gx_tieta/src/com/fgkj/actions/BattInfAction.java
index c7c9cd6..ee929e1 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;
@@ -374,7 +376,22 @@
result = ActionUtil.tojson(model);
return SUCCESS;
}
-
+
+ //璺ㄥ煙璁块棶鑾峰彇鎵�鏈夌數姹犵粍鐨勪俊鎭�<-------璺ㄥ煙----------->
+ public String searchInform_ky(){
+ isAllowHeaders(); //鍏佽璺ㄥ煙璁块棶
+ //System.out.println(key+"@@@@@@@@@@@@@@@@@@@@@@");
+ ServiceModel model = new ServiceModel();
+ if(key != null && CROSS_DOMAIN_KEY.equals(key)){
+ model = service.searchInform_ky();
+ }else{
+ model.setCode(0);
+ model.setMsg("璇嗗埆鐮侀敊璇�");
+ }
+ result = ActionUtil.tojson(model);
+ return SUCCESS;
+ }
+
public BattInf getBif() {
return bif;
}
--
Gitblit v1.9.1