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/services/ram/Fbs9100_battparamService.java | 9 ++++++---
1 files changed, 6 insertions(+), 3 deletions(-)
diff --git a/gx_tieta/src/com/fgkj/services/ram/Fbs9100_battparamService.java b/gx_tieta/src/com/fgkj/services/ram/Fbs9100_battparamService.java
index aa3a670..5484e95 100644
--- a/gx_tieta/src/com/fgkj/services/ram/Fbs9100_battparamService.java
+++ b/gx_tieta/src/com/fgkj/services/ram/Fbs9100_battparamService.java
@@ -100,7 +100,7 @@
}
//鎵归噺璁剧疆鐢垫睜鍙傛暟鏃讹紝鏍规嵁鐪佸競鍖猴紝鐢垫睜鍗曚綋鍨嬪彿锛堜紡鏁帮級锛岀粍鏁扮瓫閫夊嚭鐢垫睜缁勫苟璇诲彇瀹冪殑瀹為檯鐢垫睜鍙傛暟
public ServiceModel serchBattinfAndParam(Object obj) {
- List<BattInf> list=(new BattInfImpl()).serchByDischarge(obj);
+ List<BattInf> list=(new BattInfImpl()).serchByBatt_param(obj);
if(list!=null&&list.size()>0) {
Calendar c = Calendar.getInstance();
//鐜板湪鐨勬椂闂�(鍗曚綅锛氭绉�)
@@ -128,6 +128,9 @@
fs.setOnlineVolLow(1);
fs.setGroupConnType(1);
boolean bl=((Fbs9100_battparamImpl)dao).updatePL(fs);
+ List listb=new ArrayList();
+ listb.add(fs);
+ list.get(i).setObj(listb);
}
if(binf.getNum()==0) {
boolean b=((Fbs9100_battparamImpl)dao).getCmdAck(fs.getOp_cmd(), fs.getDev_id());
@@ -163,8 +166,8 @@
BattInf binf=new BattInf();
binf.setNum(2);
binf.setStationName("鐧捐壊");
- binf.setGroupIndexInFBSDevice(0);
- binf.setMonVolStd(12f);
+ binf.setGroupIndexInFBSDevice(100);
+ binf.setMonVolStd(2f);
ServiceModel model=service.serchBattinfAndParam(binf);
List list=(List)model.getData();
for (int i = 0; i < list.size(); i++) {
--
Gitblit v1.9.1