From 8fa9c6550cf0a2909447109fc9cfbb2974627283 Mon Sep 17 00:00:00 2001
From: 81041 <81041@192.168.10.21>
Date: 星期二, 20 十一月 2018 17:26:43 +0800
Subject: [PATCH] 放电测试时充电电流得阈值
---
gx_tieta/src/com/fgkj/dto/BattInf.java | 11 ++++++++++-
gx_tieta/src/com/fgkj/dao/impl/ram/Fbs9100_setparamImpl.java | 3 ++-
2 files changed, 12 insertions(+), 2 deletions(-)
diff --git a/gx_tieta/src/com/fgkj/dao/impl/ram/Fbs9100_setparamImpl.java b/gx_tieta/src/com/fgkj/dao/impl/ram/Fbs9100_setparamImpl.java
index 2afd9ac..c6cf635 100644
--- a/gx_tieta/src/com/fgkj/dao/impl/ram/Fbs9100_setparamImpl.java
+++ b/gx_tieta/src/com/fgkj/dao/impl/ram/Fbs9100_setparamImpl.java
@@ -296,7 +296,7 @@
public List serchbyDev_id(Object obj) {
Fbs9100_setparam fsparam=(Fbs9100_setparam) obj;
String sql=" select db_battinf.tb_battinf.StationName,db_battinf.tb_battinf.FBSDeviceId,db_battinf.tb_battinf.FBSDeviceIp,db_battinf.tb_battinf.BattGroupName" +
- ",db_battinf.tb_battinf.GroupIndexInFBSDevice,db_battinf.tb_battinf.MonCount,db_battinf.tb_battinf.MonVolStd,db_battinf.tb_battinf.MonCapStd" +
+ ",db_battinf.tb_battinf.GroupIndexInFBSDevice,db_battinf.tb_battinf.MonCount,db_battinf.tb_battinf.MonVolStd,db_battinf.tb_battinf.MonCapStd,db_battinf.tb_battinf.charge_curr_max" +
",db_ram_db.tb_fbs9100_setparam.HourRate,db_ram_db.tb_fbs9100_setparam.DisCurr,db_ram_db.tb_fbs9100_setparam.DisCap" +
",db_ram_db.tb_fbs9100_setparam.DisTime,db_ram_db.tb_fbs9100_setparam.GroupVol_LOW,db_ram_db.tb_fbs9100_setparam.MonomerVol_LOW" +
",db_ram_db.tb_fbs9100_setparam.MonomerLowCount,db_ram_db.tb_fbs9100_setparam.OnlineVolLowAction" +
@@ -323,6 +323,7 @@
binf.setMonCount(rs.getInt("monCount"));
binf.setMonVolStd(rs.getFloat("monVolStd"));
binf.setMonCapStd(rs.getFloat("monCapStd"));
+ binf.setCharge_curr_max(rs.getFloat("charge_curr_max"));
fbs9100.setBinf(binf);
Fbs9100_setparam fsparam=new Fbs9100_setparam();
diff --git a/gx_tieta/src/com/fgkj/dto/BattInf.java b/gx_tieta/src/com/fgkj/dto/BattInf.java
index 740863e..643d9ee 100644
--- a/gx_tieta/src/com/fgkj/dto/BattInf.java
+++ b/gx_tieta/src/com/fgkj/dto/BattInf.java
@@ -85,6 +85,8 @@
private Battinf_ex binf_ex;
+ private float charge_curr_max;//鍏呯數鐢垫祦闃堝��
+
private String VideoOrImage ;//涓婁紶鏂囦欢鐨勬牸寮�
public BattInf() {
super();
@@ -560,6 +562,12 @@
public void setVideoOrImage(String videoOrImage) {
VideoOrImage = videoOrImage;
}
+ public float getCharge_curr_max() {
+ return charge_curr_max;
+ }
+ public void setCharge_curr_max(float charge_curr_max) {
+ this.charge_curr_max = charge_curr_max;
+ }
@Override
public String toString() {
return "BattInf [num=" + num + ", StationId=" + StationId
@@ -602,7 +610,8 @@
+ ", Station_install=" + Station_install + ", Size=" + Size
+ ", page=" + page + ", obj=" + obj + ", station_phone="
+ station_phone + ", install_user=" + install_user
- + ", binf_ex=" + binf_ex + "]";
+ + ", binf_ex=" + binf_ex + ", charge_curr_max="
+ + charge_curr_max + ", VideoOrImage=" + VideoOrImage + "]";
}
--
Gitblit v1.9.1