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/Fbs9100_battparamAction.java | 18 +++++++++++++++++-
1 files changed, 17 insertions(+), 1 deletions(-)
diff --git a/gx_tieta/src/com/fgkj/actions/ram/Fbs9100_battparamAction.java b/gx_tieta/src/com/fgkj/actions/ram/Fbs9100_battparamAction.java
index f0b43c8..51964f2 100644
--- a/gx_tieta/src/com/fgkj/actions/ram/Fbs9100_battparamAction.java
+++ b/gx_tieta/src/com/fgkj/actions/ram/Fbs9100_battparamAction.java
@@ -5,11 +5,14 @@
import com.fgkj.actions.ActionUtil;
import com.fgkj.dao.FBS9100_ComBase;
import com.fgkj.dao.UinfDaoFactory;
+import com.fgkj.dto.BattInf;
import com.fgkj.dto.ServiceModel;
import com.fgkj.dto.User_log;
import com.fgkj.dto.ram.Fbs9100_battparam;
+import com.fgkj.dto.ram.Fbs9100_sysparam;
import com.fgkj.services.User_logService;
import com.fgkj.services.ram.Fbs9100_battparamService;
+import com.google.gson.reflect.TypeToken;
public class Fbs9100_battparamAction extends ActionUtil{
private Fbs9100_battparamService service=new Fbs9100_battparamService();
@@ -42,7 +45,20 @@
}
-
+ //鎵归噺璁剧疆鐢垫睜鍙傛暟
+ public String updatePro() {
+ List<Fbs9100_battparam> list=getGson().fromJson(json, new TypeToken<List<Fbs9100_battparam>>(){}.getType());
+ ServiceModel model = service.updatePro(list);
+ result = tojson(model);
+ return SUCCESS;
+ }
+ //鎵归噺璁剧疆鐢垫睜鍙傛暟鏃讹紝鏍规嵁鐪佸競鍖猴紝鐢垫睜鍗曚綋鍨嬪彿锛堜紡鏁帮級锛岀粍鏁扮瓫閫夊嚭鐢垫睜缁勫苟璇诲彇瀹冪殑瀹為檯鐢垫睜鍙傛暟
+ public String serchBattinfAndParam() {
+ BattInf binf=getGson().fromJson(json, BattInf.class);
+ ServiceModel model = service.serchBattinfAndParam(binf);
+ result = tojson(model);
+ return SUCCESS;
+ }
--
Gitblit v1.9.1