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/Batt_rtstateAction.java | 14 ++++++++++----
1 files changed, 10 insertions(+), 4 deletions(-)
diff --git a/gx_tieta/src/com/fgkj/actions/Batt_rtstateAction.java b/gx_tieta/src/com/fgkj/actions/Batt_rtstateAction.java
index 23bb17f..d8ce249 100644
--- a/gx_tieta/src/com/fgkj/actions/Batt_rtstateAction.java
+++ b/gx_tieta/src/com/fgkj/actions/Batt_rtstateAction.java
@@ -14,7 +14,7 @@
import com.fgkj.services.Batt_rtstateService;
import com.opensymphony.xwork2.ActionSupport;
-public class Batt_rtstateAction extends ActionSupport{
+public class Batt_rtstateAction extends ActionUtil{
private Batt_rtstateService service=new Batt_rtstateService();
private ServiceModel model;
private Batt_rtstate rtstate;
@@ -91,9 +91,15 @@
//瀹炴椂鐩戞祴涓殑鏌ヨ瀹炴椂缁勭淇℃伅 <!-- 璺ㄥ煙璁块棶 --->
public String serchByCondition_ky(){
ActionUtil.isAllowHeaders(); //鍏佽璺ㄥ煙璁块棶
- //System.out.println("寮�濮嬫煡璇tstate");
- rtstate = ActionUtil.getGson().fromJson(json, Batt_rtstate.class);
- model=service.serchByCondition_ky(rtstate);
+ model = new ServiceModel();
+ if(key != null && CROSS_DOMAIN_KEY.equals(key)){
+ //System.out.println("寮�濮嬫煡璇tstate");
+ rtstate = ActionUtil.getGson().fromJson(json, Batt_rtstate.class);
+ model=service.serchByCondition_ky(rtstate);
+ }else{
+ model.setCode(0);
+ model.setMsg("璇嗗埆鐮侀敊璇�");
+ }
//System.out.println(model);
result = ActionUtil.getGson("yyyy-MM-dd HH:mm:ss").toJson(model);
return SUCCESS;
--
Gitblit v1.9.1