From 7c358f015a99b7121bb32885658db50c3a15db7d Mon Sep 17 00:00:00 2001
From: 81041 <81041@DESKTOP-025NVD9>
Date: 星期四, 27 十二月 2018 10:20:50 +0800
Subject: [PATCH] 批量设置放电参数时查询修改
---
gx_tieta/WebRoot/WEB-INF/classes/com/fgkj/dao/impl/BattInfImpl.class | 0
gx_tieta/WebRoot/WEB-INF/classes/com/fgkj/dao/impl/BattInfImpl$70.class | 0
gx_tieta/src/com/fgkj/dao/impl/BattInfImpl.java | 38 ++++++++++++++++++++++++--------------
3 files changed, 24 insertions(+), 14 deletions(-)
diff --git a/gx_tieta/WebRoot/WEB-INF/classes/com/fgkj/dao/impl/BattInfImpl$70.class b/gx_tieta/WebRoot/WEB-INF/classes/com/fgkj/dao/impl/BattInfImpl$70.class
index fa5cb0e..08f4ef8 100644
--- a/gx_tieta/WebRoot/WEB-INF/classes/com/fgkj/dao/impl/BattInfImpl$70.class
+++ b/gx_tieta/WebRoot/WEB-INF/classes/com/fgkj/dao/impl/BattInfImpl$70.class
Binary files differ
diff --git a/gx_tieta/WebRoot/WEB-INF/classes/com/fgkj/dao/impl/BattInfImpl.class b/gx_tieta/WebRoot/WEB-INF/classes/com/fgkj/dao/impl/BattInfImpl.class
index 218b48b..e0be3c0 100644
--- a/gx_tieta/WebRoot/WEB-INF/classes/com/fgkj/dao/impl/BattInfImpl.class
+++ b/gx_tieta/WebRoot/WEB-INF/classes/com/fgkj/dao/impl/BattInfImpl.class
Binary files differ
diff --git a/gx_tieta/src/com/fgkj/dao/impl/BattInfImpl.java b/gx_tieta/src/com/fgkj/dao/impl/BattInfImpl.java
index 2c1cfa9..7c33d1d 100644
--- a/gx_tieta/src/com/fgkj/dao/impl/BattInfImpl.java
+++ b/gx_tieta/src/com/fgkj/dao/impl/BattInfImpl.java
@@ -4379,10 +4379,14 @@
BattInf binf=(BattInf) obj;
Page page=binf.getPage();
/*Connection conn=DBUtil.getConn();
- String numberSql=" SELECT FOUND_ROWS() number";*/
- String sql=" select SQL_CALC_FOUND_ROWS * from db_battinf.tb_battinf "
- + " where "
- + " GroupIndexInFBSDevice=? and MonVolStd=? ";
+ String numberSql=" SELECT FOUND_ROWS() number";SQL_CALC_FOUND_ROWS*/
+ String sql=" select distinct(StationId),StationName,StationName1,StationName2,StationName3,StationName4,StationName5,StationIp,FBSDeviceId,"
+ + "FBSDeviceName,GroupIndexInFBSDevice,db_battinf.tb_battinf.battgroupId,BattGroupNum" +
+ ",MonCount,MonCapStd,monVolStd,monResStd,MonSerStd,Load_curr,DisCurrMax"
+ + ",db_ram_db.tb_fbs9100_state.dev_version "
+ + " from db_battinf.tb_battinf,db_ram_db.tb_fbs9100_state "
+ + " where db_battinf.tb_battinf.FBSDeviceId=db_ram_db.tb_fbs9100_state.dev_id "
+ + " and GroupIndexInFBSDevice=? and MonVolStd=? and Station_install=1 ";
//+ " limit ?,? ";StationName1 like ? and StationName2 like ? and StationName3 like ? and StationName5 like ? "
//,(page.getPageCurr()-1)*page.getPageSize(),page.getPageSize(),"%"+binf.getStationName1()+"%","%"+binf.getStationName2()+"%","%"+binf.getStationName3()+"%",
//鏉′欢
@@ -4406,6 +4410,8 @@
default:
return null;
}
+
+ //鎺掑簭
String orderSql=" order by StationId asc,GroupIndexInFBSDevice asc ";
sql+=orderSql;
List list=DAOHelper.executeQuery(sql, DBUtil.getConn(), new Object[] {binf.getGroupIndexInFBSDevice(),binf.getMonVolStd(),binf.getStationName()}, new CallBack() {
@@ -4426,32 +4432,36 @@
binf.setStationIp(rs.getString("stationIp"));
binf.setFBSDeviceId(rs.getInt("fBSDeviceId"));
- binf.setFbsDeviceIp(rs.getString("fbsDeviceIp"));
+ /*binf.setFbsDeviceIp(rs.getString("fbsDeviceIp"));
binf.setFbsDeviceIp_YM(rs.getString("fbsDeviceIp_YM"));
- binf.setFbsDeviceIp_WG(rs.getString("fbsDeviceIp_WG"));
+ binf.setFbsDeviceIp_WG(rs.getString("fbsDeviceIp_WG"));*/
binf.setFBSDeviceName(rs.getString("fBSDeviceName"));
binf.setGroupIndexInFBSDevice(rs.getInt("groupIndexInFBSDevice"));
binf.setBattGroupId(rs.getInt("battGroupId"));
- binf.setBattGroupNum(rs.getInt("battGroupNum"));
+ /*binf.setBattGroupNum(rs.getInt("battGroupNum"));
binf.setBattGroupName(rs.getString("battGroupName"));
binf.setFloatVolLevel(rs.getFloat("floatVolLevel"));
binf.setOfflineVolLevel(rs.getFloat("offlineVolLevel"));
- binf.setBattFloatCurrent(rs.getFloat("battFloatCurrent"));
+ binf.setBattFloatCurrent(rs.getFloat("battFloatCurrent"));*/
binf.setMonCount(rs.getInt("monCount"));
binf.setMonCapStd(rs.getFloat("monCapStd"));
binf.setMonVolStd(rs.getFloat("monVolStd"));
binf.setMonResStd(rs.getFloat("monResStd"));
binf.setMonSerStd(rs.getFloat("monSerStd"));
- binf.setMonVolLowToAvg(rs.getFloat("monVolLowToAvg"));
+ /*binf.setMonVolLowToAvg(rs.getFloat("monVolLowToAvg"));
binf.setBattProducer(rs.getString("battProducer"));
binf.setBattModel(rs.getString("battModel"));
binf.setBattProductDate(rs.getDate("battProductDate"));
binf.setBattInUseDate(rs.getDate("battInUseDate"));
+ binf.setInstall_user(rs.getString("install_user"));*/
binf.setLoad_curr(rs.getFloat("load_curr"));
- binf.setInstall_user(rs.getString("install_user"));
+
binf.setDisCurrMax(rs.getFloat("disCurrMax"));
- binf.setStation_phone(rs.getString("station_phone"));
- binf.setStation_install(rs.getInt("station_install"));
+ /*binf.setStation_phone(rs.getString("station_phone"));
+ binf.setStation_install(rs.getInt("station_install"));*/
+
+
+ binf.setStationName9(rs.getString("dev_version"));
list.add(binf);
}
} catch (SQLException e) {
@@ -4475,9 +4485,9 @@
BattInfImpl biml = new BattInfImpl();
BattInf binf = new BattInf();
- binf.setNum(2);
+ binf.setNum(1);
binf.setBattGroupId(1000001);
- binf.setStationName("鐧捐壊");
+ binf.setStationName("骞胯タ鐪�");
binf.setStationName1("");
binf.setStationName2("鐧捐壊");
binf.setStationName3("");
--
Gitblit v1.9.1