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/WebRoot/WEB-INF/classes/com/fgkj/actions/ram/Fbs9100_battparamAction$2.class | 0
gx_tieta/WebRoot/WEB-INF/classes/com/fgkj/actions/ram/Fbs9100_setparamAction$1.class | 0
gx_tieta/src/com/fgkj/actions/ram/Fbs9100_sysparamAction.java | 9 +++++++++
gx_tieta/WebRoot/WEB-INF/classes/com/fgkj/actions/ram/Fbs9100_setparamAction$3.class | 0
gx_tieta/WebRoot/WEB-INF/classes/com/fgkj/actions/ram/Fbs9100_sysparamAction$1.class | 0
gx_tieta/WebRoot/WEB-INF/classes/com/fgkj/actions/ram/Fbs9100_sysparamAction.class | 0
gx_tieta/WebRoot/WEB-INF/classes/com/fgkj/actions/ram/Fbs9100_setparamAction$2.class | 0
gx_tieta/src/com/fgkj/dao/UinfDaoFactory.java | 3 ++-
gx_tieta/WebRoot/WEB-INF/classes/com/fgkj/actions/ram/Fbs9100_battparamAction.class | 0
gx_tieta/WebRoot/WEB-INF/classes/com/fgkj/actions/ram/Fbs9100_setparamAction.class | 0
gx_tieta/WebRoot/WEB-INF/classes/com/fgkj/dao/UinfDaoFactory.class | 0
gx_tieta/WebRoot/WEB-INF/classes/com/fgkj/actions/ram/Fbs9100_battparamAction$1.class | 0
gx_tieta/src/com/fgkj/actions/ram/Fbs9100_setparamAction.java | 15 +++++++++++++++
gx_tieta/src/com/fgkj/actions/ram/Fbs9100_battparamAction.java | 14 ++++++++++++++
14 files changed, 40 insertions(+), 1 deletions(-)
diff --git a/gx_tieta/WebRoot/WEB-INF/classes/com/fgkj/actions/ram/Fbs9100_battparamAction$1.class b/gx_tieta/WebRoot/WEB-INF/classes/com/fgkj/actions/ram/Fbs9100_battparamAction$1.class
index e9e0788..b72ddc4 100644
--- a/gx_tieta/WebRoot/WEB-INF/classes/com/fgkj/actions/ram/Fbs9100_battparamAction$1.class
+++ b/gx_tieta/WebRoot/WEB-INF/classes/com/fgkj/actions/ram/Fbs9100_battparamAction$1.class
Binary files differ
diff --git a/gx_tieta/WebRoot/WEB-INF/classes/com/fgkj/actions/ram/Fbs9100_battparamAction$2.class b/gx_tieta/WebRoot/WEB-INF/classes/com/fgkj/actions/ram/Fbs9100_battparamAction$2.class
index 6273566..24804e1 100644
--- a/gx_tieta/WebRoot/WEB-INF/classes/com/fgkj/actions/ram/Fbs9100_battparamAction$2.class
+++ b/gx_tieta/WebRoot/WEB-INF/classes/com/fgkj/actions/ram/Fbs9100_battparamAction$2.class
Binary files differ
diff --git a/gx_tieta/WebRoot/WEB-INF/classes/com/fgkj/actions/ram/Fbs9100_battparamAction.class b/gx_tieta/WebRoot/WEB-INF/classes/com/fgkj/actions/ram/Fbs9100_battparamAction.class
index 1d6ae03..c6b13cb 100644
--- a/gx_tieta/WebRoot/WEB-INF/classes/com/fgkj/actions/ram/Fbs9100_battparamAction.class
+++ b/gx_tieta/WebRoot/WEB-INF/classes/com/fgkj/actions/ram/Fbs9100_battparamAction.class
Binary files differ
diff --git a/gx_tieta/WebRoot/WEB-INF/classes/com/fgkj/actions/ram/Fbs9100_setparamAction$1.class b/gx_tieta/WebRoot/WEB-INF/classes/com/fgkj/actions/ram/Fbs9100_setparamAction$1.class
index f399baa..2f2c77c 100644
--- a/gx_tieta/WebRoot/WEB-INF/classes/com/fgkj/actions/ram/Fbs9100_setparamAction$1.class
+++ b/gx_tieta/WebRoot/WEB-INF/classes/com/fgkj/actions/ram/Fbs9100_setparamAction$1.class
Binary files differ
diff --git a/gx_tieta/WebRoot/WEB-INF/classes/com/fgkj/actions/ram/Fbs9100_setparamAction$2.class b/gx_tieta/WebRoot/WEB-INF/classes/com/fgkj/actions/ram/Fbs9100_setparamAction$2.class
index d05bd53..51f8931 100644
--- a/gx_tieta/WebRoot/WEB-INF/classes/com/fgkj/actions/ram/Fbs9100_setparamAction$2.class
+++ b/gx_tieta/WebRoot/WEB-INF/classes/com/fgkj/actions/ram/Fbs9100_setparamAction$2.class
Binary files differ
diff --git a/gx_tieta/WebRoot/WEB-INF/classes/com/fgkj/actions/ram/Fbs9100_setparamAction$3.class b/gx_tieta/WebRoot/WEB-INF/classes/com/fgkj/actions/ram/Fbs9100_setparamAction$3.class
index c57c1f6..bf684ca 100644
--- a/gx_tieta/WebRoot/WEB-INF/classes/com/fgkj/actions/ram/Fbs9100_setparamAction$3.class
+++ b/gx_tieta/WebRoot/WEB-INF/classes/com/fgkj/actions/ram/Fbs9100_setparamAction$3.class
Binary files differ
diff --git a/gx_tieta/WebRoot/WEB-INF/classes/com/fgkj/actions/ram/Fbs9100_setparamAction.class b/gx_tieta/WebRoot/WEB-INF/classes/com/fgkj/actions/ram/Fbs9100_setparamAction.class
index a954413..d2314fc 100644
--- a/gx_tieta/WebRoot/WEB-INF/classes/com/fgkj/actions/ram/Fbs9100_setparamAction.class
+++ b/gx_tieta/WebRoot/WEB-INF/classes/com/fgkj/actions/ram/Fbs9100_setparamAction.class
Binary files differ
diff --git a/gx_tieta/WebRoot/WEB-INF/classes/com/fgkj/actions/ram/Fbs9100_sysparamAction$1.class b/gx_tieta/WebRoot/WEB-INF/classes/com/fgkj/actions/ram/Fbs9100_sysparamAction$1.class
index 0f8737d..b94e06f 100644
--- a/gx_tieta/WebRoot/WEB-INF/classes/com/fgkj/actions/ram/Fbs9100_sysparamAction$1.class
+++ b/gx_tieta/WebRoot/WEB-INF/classes/com/fgkj/actions/ram/Fbs9100_sysparamAction$1.class
Binary files differ
diff --git a/gx_tieta/WebRoot/WEB-INF/classes/com/fgkj/actions/ram/Fbs9100_sysparamAction.class b/gx_tieta/WebRoot/WEB-INF/classes/com/fgkj/actions/ram/Fbs9100_sysparamAction.class
index effa417..9c9ea09 100644
--- a/gx_tieta/WebRoot/WEB-INF/classes/com/fgkj/actions/ram/Fbs9100_sysparamAction.class
+++ b/gx_tieta/WebRoot/WEB-INF/classes/com/fgkj/actions/ram/Fbs9100_sysparamAction.class
Binary files differ
diff --git a/gx_tieta/WebRoot/WEB-INF/classes/com/fgkj/dao/UinfDaoFactory.class b/gx_tieta/WebRoot/WEB-INF/classes/com/fgkj/dao/UinfDaoFactory.class
index 21563bb..3def845 100644
--- a/gx_tieta/WebRoot/WEB-INF/classes/com/fgkj/dao/UinfDaoFactory.class
+++ b/gx_tieta/WebRoot/WEB-INF/classes/com/fgkj/dao/UinfDaoFactory.class
Binary files differ
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;
+ }
diff --git a/gx_tieta/src/com/fgkj/actions/ram/Fbs9100_setparamAction.java b/gx_tieta/src/com/fgkj/actions/ram/Fbs9100_setparamAction.java
index 039d68b..1fe7059 100644
--- a/gx_tieta/src/com/fgkj/actions/ram/Fbs9100_setparamAction.java
+++ b/gx_tieta/src/com/fgkj/actions/ram/Fbs9100_setparamAction.java
@@ -19,6 +19,7 @@
private Fbs9100_setparamService service = new Fbs9100_setparamService();
private User_logService uservice=new User_logService();
private String json;
+ private String json_msg;
private String result;
//鏍规嵁鏈烘埧缂栧彿鍜岀淮鎶ゅ尯鏌ヨ鏀剧數鏈烘埧鐨勪俊鎭拰鏀剧數鍙傛暟
@@ -53,6 +54,11 @@
public String updatePro() {
List<Fbs9100_setparam> list=getGson().fromJson(json, new TypeToken<List<Fbs9100_setparam>>(){}.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;
}
@@ -60,6 +66,11 @@
public String updatePro_dis() {
List<Fbs9100_setparam> list=getGson().fromJson(json, new TypeToken<List<Fbs9100_setparam>>(){}.getType());
ServiceModel model = service.updatePro_dis(list);
+ {
+ String msg="鎵归噺鍚姩"+json_msg+"鐨勬斁鐢�";
+ User_log ulog=UinfDaoFactory.CreateULog(UinfDaoFactory.Batch, msg);
+ uservice.add(ulog);//灏嗙敤鎴风殑鎿嶄綔璁板綍涓嬫潵
+ }
result = tojson(model);
return SUCCESS;
}
@@ -148,5 +159,9 @@
public void setJson(String json) {
this.json = json;
}
+
+ public void setJson_msg(String json_msg) {
+ this.json_msg = json_msg;
+ }
}
diff --git a/gx_tieta/src/com/fgkj/actions/ram/Fbs9100_sysparamAction.java b/gx_tieta/src/com/fgkj/actions/ram/Fbs9100_sysparamAction.java
index 9a3cc86..bfa3195 100644
--- a/gx_tieta/src/com/fgkj/actions/ram/Fbs9100_sysparamAction.java
+++ b/gx_tieta/src/com/fgkj/actions/ram/Fbs9100_sysparamAction.java
@@ -18,6 +18,7 @@
private Fbs9100_sysparamService service=new Fbs9100_sysparamService();
private User_logService uservice=new User_logService();
private String json;
+ private String json_msg;
private String result;
//淇敼绯荤粺鍙傛暟
@@ -42,6 +43,11 @@
public String updatePro() {
List<Fbs9100_sysparam> list=getGson().fromJson(json, new TypeToken<List<Fbs9100_sysparam>>(){}.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;
}
@@ -68,6 +74,9 @@
public void setJson(String json) {
this.json = json;
}
+ public void setJson_msg(String json_msg) {
+ this.json_msg = json_msg;
+ }
diff --git a/gx_tieta/src/com/fgkj/dao/UinfDaoFactory.java b/gx_tieta/src/com/fgkj/dao/UinfDaoFactory.java
index ae3ae30..f333445 100644
--- a/gx_tieta/src/com/fgkj/dao/UinfDaoFactory.java
+++ b/gx_tieta/src/com/fgkj/dao/UinfDaoFactory.java
@@ -21,7 +21,8 @@
public static int Cancel=7; //鍙栨秷
public static int Start_up=8; //鍚姩
public static int End=9; //缁堟
-
+ public static int Batch=10; //鎵归噺
+
//鏋勫缓user_log瀵硅薄<msg鍜宼ype娌″啓>
public static User_log CreateULog(int op_type,String msg){
--
Gitblit v1.9.1