From b3460365bca5a645e3e37d69dd606ae8bea8cbb0 Mon Sep 17 00:00:00 2001
From: whyclj <1525436766@qq.com>
Date: 星期一, 07 一月 2019 16:11:00 +0800
Subject: [PATCH] Merge branch 'dev_lxw' of https://whyclj@gitlab.com/whyclxw1/gx_tieta.git into dev_lxw
---
gx_tieta/src/com/fgkj/actions/ram/Fbs9100s_dcdc_stateAction.java | 7 +++++++
1 files changed, 7 insertions(+), 0 deletions(-)
diff --git a/gx_tieta/src/com/fgkj/actions/ram/Fbs9100s_dcdc_stateAction.java b/gx_tieta/src/com/fgkj/actions/ram/Fbs9100s_dcdc_stateAction.java
index b490ec8..1445772 100644
--- a/gx_tieta/src/com/fgkj/actions/ram/Fbs9100s_dcdc_stateAction.java
+++ b/gx_tieta/src/com/fgkj/actions/ram/Fbs9100s_dcdc_stateAction.java
@@ -21,6 +21,13 @@
result = tojson(model);
return SUCCESS;
}
+ //瀹炴椂椤甸潰鎷撴墤鍥句腑鏄剧ず璁惧鐨勪袱涓猟cdc
+ public String serchByInfo(){
+ Fbs9100s_dcdc_state dcdc = getGson("yyyy-MM-dd HH:mm:ss").fromJson(json, Fbs9100s_dcdc_state.class);
+ ServiceModel model = service.serchByInfo(dcdc);
+ result = tojson(model);
+ return SUCCESS;
+ }
//鍒锋柊dcdc妯″潡淇℃伅琛ㄦ牸涓暟鎹�
public String refreshTable(){
List<FBS9100> list= getGson("yyyy-MM-dd HH:mm:ss").fromJson(json, new TypeToken<List<FBS9100>>(){}.getType());
--
Gitblit v1.9.1