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/Batt_rtstateAction.java | 13 ++++---------
1 files changed, 4 insertions(+), 9 deletions(-)
diff --git a/gx_tieta/src/com/fgkj/actions/Batt_rtstateAction.java b/gx_tieta/src/com/fgkj/actions/Batt_rtstateAction.java
index d8ce249..74ee71d 100644
--- a/gx_tieta/src/com/fgkj/actions/Batt_rtstateAction.java
+++ b/gx_tieta/src/com/fgkj/actions/Batt_rtstateAction.java
@@ -90,16 +90,11 @@
//瀹炴椂鐩戞祴涓殑鏌ヨ瀹炴椂缁勭淇℃伅 <!-- 璺ㄥ煙璁块棶 --->
public String serchByCondition_ky(){
- ActionUtil.isAllowHeaders(); //鍏佽璺ㄥ煙璁块棶
+ //ActionUtil.isAllowHeaders(); //鍏佽璺ㄥ煙璁块棶
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("寮�濮嬫煡璇tstate");
+ rtstate = ActionUtil.getGson().fromJson(json, Batt_rtstate.class);
+ model=service.serchByCondition_ky(rtstate);
//System.out.println(model);
result = ActionUtil.getGson("yyyy-MM-dd HH:mm:ss").toJson(model);
return SUCCESS;
--
Gitblit v1.9.1