From 0edab78d73d975663da8ce2596a0a00c1b6a6db1 Mon Sep 17 00:00:00 2001
From: hdw <496960745@qq.com>
Date: 星期一, 12 十一月 2018 08:51:53 +0800
Subject: [PATCH] Merge branch 'dev_lxw' of https://whychdw@gitlab.com/whyclxw1/gx_tieta.git into dev_lxw
---
gx_tieta/src/com/fgkj/services/ram/Fbs9100_sysparamService.java | 32 ++++++++++++++++++++------------
1 files changed, 20 insertions(+), 12 deletions(-)
diff --git a/gx_tieta/src/com/fgkj/services/ram/Fbs9100_sysparamService.java b/gx_tieta/src/com/fgkj/services/ram/Fbs9100_sysparamService.java
index 476d997..d60de0d 100644
--- a/gx_tieta/src/com/fgkj/services/ram/Fbs9100_sysparamService.java
+++ b/gx_tieta/src/com/fgkj/services/ram/Fbs9100_sysparamService.java
@@ -23,25 +23,33 @@
//淇敼绯荤粺鍙傛暟
public ServiceModel update(Object obj) {
Fbs9100_sysparam fbs_sys=(Fbs9100_sysparam) obj;
- Boolean b=dao.update(obj);
boolean bl=false;
- if(b){
- if(fbs_sys.getNum()==FBS9100_ComBase.CMD_ResetSystem){//閲嶅惎
- bl=(new Fbs9100_setparamImpl()).sendCmdToFBS9100Dev(fbs_sys.getNum(),0, fbs_sys.getDev_id());
- }else{
- bl=((Fbs9100_sysparamImpl)dao).sendCmdToFBS9100Dev(fbs_sys.getNum(), fbs_sys.getDev_id());
- }
+ if(fbs_sys.getNum()==FBS9100_ComBase.CMD_ResetSystem){//閲嶅惎
+ bl=(new Fbs9100_setparamImpl()).sendCmdToFBS9100Dev(fbs_sys.getNum(),0, fbs_sys.getDev_id());
if(bl){
model.setCode(1);
- model.setMsg("淇敼鎴愬姛!");
+ model.setMsg("閲嶅惎鎴愬姛!");
}else{
model.setCode(0);
- model.setMsg("璁剧疆9100鍙傛暟澶辫触,璇锋鏌ョ綉缁�!");
+ model.setMsg("閲嶅惎澶辫触!");
}
}else{
- model.setCode(0);
- model.setMsg("淇敼澶辫触!");
- }
+ Boolean b=dao.update(obj);
+ if(b){
+ bl=((Fbs9100_sysparamImpl)dao).sendCmdToFBS9100Dev(fbs_sys.getNum(), fbs_sys.getDev_id());
+ if(bl){
+ model.setCode(1);
+ model.setMsg("淇敼鎴愬姛!");
+ }else{
+ model.setCode(0);
+ model.setMsg("璁剧疆9100鍙傛暟澶辫触,璇锋鏌ョ綉缁�!");
+ }
+ }else{
+ model.setCode(0);
+ model.setMsg("淇敼澶辫触!");
+ }
+ }
+
return model;
}
--
Gitblit v1.9.1