From 2fe250ece8de95b3f70172fe5b45793ab6a3084a Mon Sep 17 00:00:00 2001
From: D:/workspace/chenjingjing/git/gx_tieta/gx_tieta/.gitignore <chenjingjing@LAPTOP-E51P2139>
Date: 星期五, 18 一月 2019 17:30:50 +0800
Subject: [PATCH] 未审批可更改
---
gx_tieta/src/com/fgkj/dao/impl/BattInfImpl.java | 10 +++++-----
1 files changed, 5 insertions(+), 5 deletions(-)
diff --git a/gx_tieta/src/com/fgkj/dao/impl/BattInfImpl.java b/gx_tieta/src/com/fgkj/dao/impl/BattInfImpl.java
index a88ed4e..ee5eb46 100644
--- a/gx_tieta/src/com/fgkj/dao/impl/BattInfImpl.java
+++ b/gx_tieta/src/com/fgkj/dao/impl/BattInfImpl.java
@@ -4497,7 +4497,7 @@
//Page page=binf.getPage();
/*Connection conn=DBUtil.getConn();
String numberSql=" SELECT FOUND_ROWS() number";SQL_CALC_FOUND_ROWS*/
- String sql=" select distinct(StationId),StationName,StationName1,StationName2,StationName3,StationName4,StationName5,StationIp,FBSDeviceId,"
+ String sql=" select distinct(db_battinf.tb_battinf.StationId),StationName,StationName1,StationName2,StationName3,StationName4,StationName5,StationIp,FBSDeviceId,"
+ "FBSDeviceName,battGroupNum" +
",MonCount,MonCapStd,monVolStd,monResStd,MonSerStd,Load_curr,DisCurrMax,montmpstd,floatVolLevel,offlineVolLevel,battFloatCurrent"
+ ",db_ram_db.tb_fbs9100_state.dev_version "
@@ -4507,7 +4507,7 @@
//+ " 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()+"%",
//鏉′欢
- String sql0=" and stationid=? "; //鍏蜂綋鏈烘埧
+ String sql0=" and db_battinf.tb_battinf.stationid=? "; //鍏蜂綋鏈烘埧
String sql1=" and stationname1=? ";//鐪�
String sql2=" and stationname2=? ";//甯�
String sql5=" and stationname5=? ";//鍖哄幙
@@ -4615,7 +4615,7 @@
//+ " 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()+"%",
//鏉′欢
- String sql0=" and stationid=? "; //鍏蜂綋鏈烘埧
+ String sql0=" and db_battinf.tb_battinf.stationid=? "; //鍏蜂綋鏈烘埧
String sql1=" and stationname1=? ";//鐪�
String sql2=" and stationname2=? ";//甯�
String sql5=" and stationname5=? ";//鍖哄幙
@@ -4717,9 +4717,9 @@
BattInfImpl biml = new BattInfImpl();
BattInf binf = new BattInf();
- binf.setNum(2);
+ binf.setNum(0);
binf.setBattGroupId(1000001);
- binf.setStationName("鐧捐壊");
+ binf.setStationName("42000611");
binf.setStationName1("");
binf.setStationName2("");
binf.setStationName3("");
--
Gitblit v1.9.1