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/BatttestdataAction.java | 16 +++++++++++-----
1 files changed, 11 insertions(+), 5 deletions(-)
diff --git a/gx_tieta/src/com/fgkj/actions/BatttestdataAction.java b/gx_tieta/src/com/fgkj/actions/BatttestdataAction.java
index f0ae854..e50ffd1 100644
--- a/gx_tieta/src/com/fgkj/actions/BatttestdataAction.java
+++ b/gx_tieta/src/com/fgkj/actions/BatttestdataAction.java
@@ -6,7 +6,7 @@
import com.fgkj.services.Batttestdata_infService;
import com.opensymphony.xwork2.ActionSupport;
-public class BatttestdataAction extends ActionSupport {
+public class BatttestdataAction extends ActionUtil{
private BatttestdataService service = new BatttestdataService();
private String result;
private Batttestdata btd;
@@ -39,10 +39,16 @@
* @return
*/
public String findhistory_ky(){
- ActionUtil.isAllowHeaders();
- Batttestdata btd = ActionUtil.getGson().fromJson(json, Batttestdata.class);
- //System.out.println(btd);
- ServiceModel model = service.serchByCondition_ky(btd);
+ isAllowHeaders();
+ ServiceModel model = new ServiceModel();
+ if(key !=null && CROSS_DOMAIN_KEY.equals(key)){
+ Batttestdata btd = ActionUtil.getGson().fromJson(json, Batttestdata.class);
+ //System.out.println(btd);
+ model = service.serchByCondition_ky(btd);
+ }else{
+ model.setCode(0);
+ model.setMsg("璇嗗埆鐮侀敊璇�");
+ }
result = ActionUtil.tojson(model);
//System.out.println("*************************");
return SUCCESS;
--
Gitblit v1.9.1