From 5c1209b81f457cca5711a75192dd5f049244ebcf Mon Sep 17 00:00:00 2001
From: whyclj <1525436766@qq.com>
Date: 星期三, 09 一月 2019 10:40:21 +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 | 14 ++++++++++++++
1 files changed, 14 insertions(+), 0 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 f18aca6..74bf343 100644
--- a/gx_tieta/src/com/fgkj/actions/ram/Fbs9100_battparamAction.java
+++ b/gx_tieta/src/com/fgkj/actions/ram/Fbs9100_battparamAction.java
@@ -18,6 +18,7 @@
private Fbs9100_battparamService service=new Fbs9100_battparamService();
private User_logService uservice=new User_logService();
private String json;
+ private String json_msg;
private String result;
//鑾峰彇鐢垫睜鍙傛暟淇℃伅
@@ -49,6 +50,11 @@
public String updatePro() {
List<Fbs9100_battparam> list=getGson().fromJson(json, new TypeToken<List<Fbs9100_battparam>>(){}.getType());
ServiceModel model = service.updatePro(list);
+ {
+ String msg="鎵归噺璁剧疆"+json_msg+"鐨勭數姹犲弬鏁颁俊鎭�";
+ User_log ulog=UinfDaoFactory.CreateULog(UinfDaoFactory.Batch, msg);
+ uservice.add(ulog);//灏嗙敤鎴风殑鎿嶄綔璁板綍涓嬫潵
+ }
result = tojson(model);
return SUCCESS;
}
@@ -64,6 +70,11 @@
public String readPL() {
List<Fbs9100_battparam> list=getGson().fromJson(json, new TypeToken<List<Fbs9100_battparam>>(){}.getType());
ServiceModel model = service.readPL(list);
+ {
+ String msg="鎵归噺璇诲彇"+json_msg+"鐨勭數姹犲弬鏁颁俊鎭�";
+ User_log ulog=UinfDaoFactory.CreateULog(UinfDaoFactory.Batch, msg);
+ uservice.add(ulog);//灏嗙敤鎴风殑鎿嶄綔璁板綍涓嬫潵
+ }
result = tojson(model);
return SUCCESS;
}
@@ -78,6 +89,9 @@
public void setJson(String json) {
this.json = json;
}
+ public void setJson_msg(String json_msg) {
+ this.json_msg = json_msg;
+ }
--
Gitblit v1.9.1