From d7049dae792f0a6d2ee4246acf4b42bf0b36635c Mon Sep 17 00:00:00 2001
From: Administrator <Administrator@USER-20180117QL>
Date: 星期二, 25 十二月 2018 11:11:02 +0800
Subject: [PATCH] Merge branch 'dev_lxw' of https://whyccjj@gitlab.com/whyclxw1/gx_tieta.git into dev_lxw
---
gx_tieta/src/com/fgkj/actions/ram/Fbs9100_setparamAction.java | 19 +++++++++++++++++++
1 files changed, 19 insertions(+), 0 deletions(-)
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 a5aac33..2e556c3 100644
--- a/gx_tieta/src/com/fgkj/actions/ram/Fbs9100_setparamAction.java
+++ b/gx_tieta/src/com/fgkj/actions/ram/Fbs9100_setparamAction.java
@@ -40,6 +40,8 @@
msg="鍚姩"+fbs.getDev_id()+"鐨勮澶囨斁鐢�";
}else if(fbs.getNum()==FBS9100_ComBase.CMD_Stop){
msg="鍋滄"+fbs.getDev_id()+"鐨勮澶囨斁鐢�";
+ }else if(fbs.getNum()==FBS9100_ComBase.CMD_GetDischargeParm){
+ msg="鑾峰彇"+fbs.getDev_id()+"鐨勮澶囨斁鐢靛弬鏁�";
}
User_log ulog=UinfDaoFactory.CreateULog(UinfDaoFactory.Alter, msg);
uservice.add(ulog);//灏嗙敤鎴风殑鎿嶄綔璁板綍涓嬫潵
@@ -58,6 +60,8 @@
msg="鍚姩"+fbs.getDev_id()+"鐨勮澶囨斁鐢�";
}else if(fbs.getNum()==FBS9100_ComBase.CMD_Stop){
msg="鍋滄"+fbs.getDev_id()+"鐨勮澶囨斁鐢�";
+ }else if(fbs.getNum()==FBS9100_ComBase.CMD_GetDischargeParm){
+ msg="鑾峰彇"+fbs.getDev_id()+"鐨勮澶囨斁鐢靛弬鏁�";
}
User_log ulog=UinfDaoFactory.CreateULog(UinfDaoFactory.Alter, msg);
uservice.add(ulog);//灏嗙敤鎴风殑鎿嶄綔璁板綍涓嬫潵
@@ -76,6 +80,8 @@
msg="鍚姩"+fbs.getDev_id()+"鐨勮澶囨斁鐢�";
}else if(fbs.getNum()==FBS9100_ComBase.CMD_Stop){
msg="鍋滄"+fbs.getDev_id()+"鐨勮澶囨斁鐢�";
+ }else if(fbs.getNum()==FBS9100_ComBase.CMD_GetDischargeParm){
+ msg="鑾峰彇"+fbs.getDev_id()+"鐨勮澶囨斁鐢靛弬鏁�";
}
User_log ulog=UinfDaoFactory.CreateULog(UinfDaoFactory.Alter, msg);
uservice.add(ulog);//灏嗙敤鎴风殑鎿嶄綔璁板綍涓嬫潵
@@ -88,6 +94,19 @@
public String serchbyDev_id() {
Fbs9100_setparam fsparam = getGson().fromJson(json, Fbs9100_setparam.class);
ServiceModel model = service.serchbyDev_id(fsparam);
+ { String msg="";
+ if(fsparam.getNum()==FBS9100_ComBase.CMD_SetDischargeParm){
+ msg="淇敼"+fsparam.getDev_id()+"鐨勮澶囨斁鐢靛弬鏁�";
+ }else if(fsparam.getNum()==FBS9100_ComBase.CMD_Start){
+ msg="鍚姩"+fsparam.getDev_id()+"鐨勮澶囨斁鐢�";
+ }else if(fsparam.getNum()==FBS9100_ComBase.CMD_Stop){
+ msg="鍋滄"+fsparam.getDev_id()+"鐨勮澶囨斁鐢�";
+ }else if(fsparam.getNum()==FBS9100_ComBase.CMD_GetDischargeParm){
+ msg="鑾峰彇"+fsparam.getDev_id()+"鐨勮澶囨斁鐢靛弬鏁�";
+ }
+ User_log ulog=UinfDaoFactory.CreateULog(UinfDaoFactory.Alter, msg);
+ uservice.add(ulog);//灏嗙敤鎴风殑鎿嶄綔璁板綍涓嬫潵
+ }
result = tojson(model);
return SUCCESS;
}
--
Gitblit v1.9.1