From d3281891af5bf8e5069cb15b1f9c1d6a14c212c6 Mon Sep 17 00:00:00 2001
From: 星伟 <星伟@192.168.10.25>
Date: 星期四, 27 九月 2018 17:30:00 +0800
Subject: [PATCH] 设备告警参数修改
---
gx_tieta/src/com/fgkj/dao/impl/BattInfImpl.java | 171 ++++++++++++++++++++++++++++++++++----------------------
1 files changed, 104 insertions(+), 67 deletions(-)
diff --git a/gx_tieta/src/com/fgkj/dao/impl/BattInfImpl.java b/gx_tieta/src/com/fgkj/dao/impl/BattInfImpl.java
index 96b9411..5512cfa 100644
--- a/gx_tieta/src/com/fgkj/dao/impl/BattInfImpl.java
+++ b/gx_tieta/src/com/fgkj/dao/impl/BattInfImpl.java
@@ -168,10 +168,10 @@
+ "FBSDeviceName,GroupIndexInFBSDevice,battgroupId,BattGroupNum,BattGroupName,FloatVolLevel,OfflineVolLevel,BattFloatCurrent" +
",MonCount,MonCapStd,monVolStd,monResStd,MonSerStd,MonVolLowToAvg,BattProducer,BattModel,BattProductDate,BattInUseDate " +
" From db_battinf.tb_battinf " +
- " Where StationName like ? and StationName1 like ? " +
+ " Where StationName like ? and StationName1 like ? and StationName2 like ? " +
" order by StationId " +
" limit ?,?";
- List<BattInf> list=DAOHelper.executeQueryLimit(sql,conn, new Object[]{"%"+binf.getStationName()+"%","%"+binf.getStationName1()+"%",(page.getPageCurr()-1)*page.getPageSize(),page.getPageSize()},new CallBack() {
+ List<BattInf> list=DAOHelper.executeQueryLimit(sql,conn, new Object[]{"%"+binf.getStationName()+"%","%"+binf.getStationName1()+"%","%"+binf.getStationName2()+"%",(page.getPageCurr()-1)*page.getPageSize(),page.getPageSize()},new CallBack() {
public List getResults(ResultSet rs) {
List list = new ArrayList<BattInf>();
@@ -1428,14 +1428,14 @@
" and db_user.tb_user_battgroup_baojigroup_usr.baoji_group_id=db_user.tb_user_battgroup_baojigroup_battgroup.baoji_group_id " +
" and db_user.tb_user_inf.uid=db_user.tb_user_battgroup_baojigroup_usr.uid " +
" and db_user.tb_user_inf.uid=? " +
- " and db_battinf.tb_battinf.stationname1 like ? and db_battinf.tb_battinf.stationname like ?)";
+ " and db_battinf.tb_battinf.stationname1 like ? and db_battinf.tb_battinf.stationname like ? and db_battinf.tb_battinf.stationname2 like ? )";
baseSql+=userSql;
String endSql=" order by StationName1 asc,db_battinf.tb_battinf.BattgroupId asc ";
sql=baseSql+endSql;
String limitSql=" limit ?,? ";
sql+=limitSql;
//System.out.println(sql);
- List<BattInf> list = DAOHelper.executeQueryLimit(sql,conn,new Object[] {binf.getBattGroupId(),uinf.getUId(),"%"+binf.getStationName1()+"%","%"+binf.getStationName()+"%",(page.getPageCurr()-1)*page.getPageSize(),page.getPageSize()},
+ List<BattInf> list = DAOHelper.executeQueryLimit(sql,conn,new Object[] {binf.getBattGroupId(),uinf.getUId(),"%"+binf.getStationName1()+"%","%"+binf.getStationName()+"%","%"+binf.getStationName2()+"%",(page.getPageCurr()-1)*page.getPageSize(),page.getPageSize()},
new CallBack() {
public List getResults(ResultSet rs) {
List list=new ArrayList();
@@ -1629,7 +1629,7 @@
" and db_user.tb_user_battgroup_baojigroup_usr.baoji_group_id=db_user.tb_user_battgroup_baojigroup_battgroup.baoji_group_id " +
" and db_user.tb_user_inf.uid=db_user.tb_user_battgroup_baojigroup_usr.uid " +
" and db_user.tb_user_inf.uid=? " +
- " and db_battinf.tb_battinf.stationname1 like ? and db_battinf.tb_battinf.stationname like ?)";
+ " and db_battinf.tb_battinf.stationname1 like ? and db_battinf.tb_battinf.stationname like ? and db_battinf.tb_battinf.stationname2 like ?)";
baseSql+=userSql;
//鎺掑簭
String endSql=" order by db_battinf.tb_battinf.battgroupid asc ";
@@ -1639,7 +1639,7 @@
sql=baseSql+endSql+limitSql;
//System.out.println(sql);
List<BattInf> list=DAOHelper.executeQueryLimit(sql,conn, new Object[]{
- binf.getBattGroupId(),uinf.getUId(),"%"+binf.getStationName1()+"%","%"+binf.getStationName()+"%",
+ binf.getBattGroupId(),uinf.getUId(),"%"+binf.getStationName1()+"%","%"+binf.getStationName()+"%","%"+binf.getStationName2()+"%",
(page.getPageCurr()-1)*page.getPageSize(),page.getPageSize()}, new CallBack() {
public List getResults(ResultSet rs) {
@@ -1850,7 +1850,7 @@
" and db_user.tb_user_battgroup_baojigroup_usr.baoji_group_id=db_user.tb_user_battgroup_baojigroup_battgroup.baoji_group_id " +
" and db_user.tb_user_inf.uid=db_user.tb_user_battgroup_baojigroup_usr.uid " +
" and db_user.tb_user_inf.uid=? " +
- " and db_battinf.tb_battinf.stationname1 like ? and db_battinf.tb_battinf.stationname like ?)";
+ " and db_battinf.tb_battinf.stationname1 like ? and db_battinf.tb_battinf.stationname like ? and db_battinf.tb_battinf.stationname2 like ?)";
baseSql+=userSql;
//鍏呯數鏀剧數閫夋嫨
String test_typeA="";//鍏ㄩ儴
@@ -1886,7 +1886,7 @@
//System.out.println(sql);
List<BattInf> list=DAOHelper.executeQuery(sql,DBUtil.getConn(), new Object[]{
tinf.getRecord_time(),tinf.getRecord_time1()
- ,binf.getBattGroupId(),uinf.getUId(),"%"+binf.getStationName1()+"%","%"+binf.getStationName()+"%"
+ ,binf.getBattGroupId(),uinf.getUId(),"%"+binf.getStationName1()+"%","%"+binf.getStationName()+"%","%"+binf.getStationName2()+"%"
}, new CallBack() {
public List getResults(ResultSet rs) {
@@ -3244,83 +3244,119 @@
}
- //鏌ヨ鎵�鏈夌殑鏈烘埧
+ //鏌ヨ鎵�鏈夌殑鐪佷唤(宸︿晶瀵艰埅绗竴灞傦紝鏌ユ墍鏈夌殑鐪佷唤,num涓瓨鏀緐id)
public List serchAllStation(Object obj){
- User_inf uinf=(User_inf) obj;
- String sql="select DISTINCT stationid,StationName,StationName1,StationName2,StationName3,StationName4,StationName5,StationName6,StationName7,StationName8,StationName9,fBSDeviceId " +
+ BattInf binf=(BattInf) obj;;
+ String sql="select DISTINCT StationName1 " +
" FROM db_battinf.tb_battinf " +
" where StationId in(" +
" select distinct db_user.tb_user_battgroup_baojigroup_battgroup.StationId from db_user.tb_user_battgroup_baojigroup_battgroup,db_user.tb_user_battgroup_baojigroup_usr where db_user.tb_user_battgroup_baojigroup_battgroup.baoji_group_id=db_user.tb_user_battgroup_baojigroup_usr.baoji_group_id and db_user.tb_user_battgroup_baojigroup_usr.uId=?" +
- " )";
- List list=DAOHelper.executeQuery(sql, DBUtil.getConn(), new Object[]{uinf.getUId()},new CallBack() {
+ " ) ORDER BY CONVERT( StationName1 USING gbk ) COLLATE gbk_chinese_ci ASC";
+ List list=DAOHelper.executeQuery(sql, DBUtil.getConn(), new Object[]{binf.getNum()},new CallBack() {
public List getResults(ResultSet rs) {
List list=new ArrayList();
- String conStr="-";//杩炴帴鏈烘埧鍚嶇О鐨勭鍙�
- try {
- while(rs.next()){
- BattInf batt = new BattInf();
- String stationName="";
- if(!rs.getString("StationName1").trim().equals("")){
- stationName+=rs.getString("StationName1");
+ try {
+ while(rs.next()){
+ BattInf batt = new BattInf();
+ batt.setStationName1(rs.getString("stationName1"));
+ list.add(batt);
}
- if(!rs.getString("StationName2").trim().equals("")){
- stationName+=conStr;
- stationName+=rs.getString("StationName2");
- }
- if(!rs.getString("StationName3").trim().equals("")){
- stationName+=conStr;
- stationName+=rs.getString("StationName3");
- }
- if(!rs.getString("StationName4").trim().equals("")){
- stationName+=conStr;
- stationName+=rs.getString("StationName4");
- }
- if(!rs.getString("StationName5").trim().equals("")){
- stationName+=conStr;
- stationName+=rs.getString("StationName5");
- }
- if(!rs.getString("StationName6").trim().equals("")){
- stationName+=conStr;
- stationName+=rs.getString("StationName6");
- }
- if(!rs.getString("StationName7").trim().equals("")){
- stationName+=conStr;
- stationName+=rs.getString("StationName7");
- }
- if(!rs.getString("StationName8").trim().equals("")){
- stationName+=conStr;
- stationName+=rs.getString("StationName8");
- }
- if(!rs.getString("StationName9").trim().equals("")){
- stationName+=conStr;
- stationName+=rs.getString("StationName9");
- }
- batt.setStationName(stationName);
- batt.setStationId(rs.getString("StationId"));
- batt.setFBSDeviceId(rs.getInt("fBSDeviceId"));
- list.add(batt);
+ } catch (SQLException e) {
+ // TODO Auto-generated catch block
+ e.printStackTrace();
}
- } catch (SQLException e) {
- // TODO Auto-generated catch block
- e.printStackTrace();
- }
return list;
}
} );
return list;
}
- //鏍规嵁鏈烘埧id鏌ヨ鏈烘埧涓嬬殑鐢垫睜缁勪俊鎭�
+
+ //鏌ヨ绠＄悊鐨勫競(宸︿晶瀵艰埅绗簩灞傦紝鏌ユ墍鏈夌殑甯�,num涓瓨鏀緐id)
+ public List serchStationName2(Object obj){
+ BattInf binf=(BattInf) obj;
+ String sql="select DISTINCT StationName1,StationName2 " +
+ " FROM db_battinf.tb_battinf " +
+ " where StationId in(" +
+ " select distinct db_user.tb_user_battgroup_baojigroup_battgroup.StationId from db_user.tb_user_battgroup_baojigroup_battgroup,db_user.tb_user_battgroup_baojigroup_usr where db_user.tb_user_battgroup_baojigroup_battgroup.baoji_group_id=db_user.tb_user_battgroup_baojigroup_usr.baoji_group_id and db_user.tb_user_battgroup_baojigroup_usr.uId=?" +
+ " ) and StationName1 like ? " +
+ " ORDER BY CONVERT( StationName2 USING gbk ) COLLATE gbk_chinese_ci ASC ";
+ List list=DAOHelper.executeQuery(sql, DBUtil.getConn(), new Object[]{binf.getNum(),"%"+binf.getStationName1()+"%"},new CallBack() {
+
+ public List getResults(ResultSet rs) {
+ List list=new ArrayList();
+ try {
+ while(rs.next()){
+ BattInf batt = new BattInf();
+ batt.setStationName1(rs.getString("stationName1"));
+ batt.setStationName2(rs.getString("stationName2"));
+ list.add(batt);
+ }
+ } catch (SQLException e) {
+ // TODO Auto-generated catch block
+ e.printStackTrace();
+ }
+ return list;
+ }
+ } );
+ return list;
+ }
+ //鏌ヨ绠＄悊鐨勬満鎴�(宸︿晶瀵艰埅绗笁灞傦紝鏌ユ墍鏈夌殑鏈烘埧,num涓瓨鏀緐id)
+ public List serchStationName3(Object obj){
+ BattInf binf=(BattInf) obj;
+ String sql="select DISTINCT StationName,StationName1,StationName2,StationName3,stationid,fbsdeviceid,FBSDeviceName " +
+ " FROM db_battinf.tb_battinf " +
+ " where StationId in(" +
+ " select distinct db_user.tb_user_battgroup_baojigroup_battgroup.StationId from db_user.tb_user_battgroup_baojigroup_battgroup,db_user.tb_user_battgroup_baojigroup_usr where db_user.tb_user_battgroup_baojigroup_battgroup.baoji_group_id=db_user.tb_user_battgroup_baojigroup_usr.baoji_group_id and db_user.tb_user_battgroup_baojigroup_usr.uId=?" +
+ " ) and StationName1 like ? and StationName2 like ? " +
+ " ORDER BY CONVERT( StationName USING gbk ) COLLATE gbk_chinese_ci ASC ";
+ List list=DAOHelper.executeQuery(sql, DBUtil.getConn(), new Object[]{binf.getNum(),"%"+binf.getStationName1()+"%","%"+binf.getStationName2()+"%"},new CallBack() {
+
+ public List getResults(ResultSet rs) {
+ List list=new ArrayList();
+ try {
+ while(rs.next()){
+ BattInf batt = new BattInf();
+ batt.setStationName(rs.getString("stationName"));
+ batt.setStationName1(rs.getString("stationName1"));
+ batt.setStationName2(rs.getString("stationName2"));
+ batt.setStationName3(rs.getString("stationName3"));
+ batt.setStationId(rs.getString("stationId"));
+ batt.setFBSDeviceName(rs.getString("fBSDeviceName"));
+ batt.setFBSDeviceId(rs.getInt("fBSDeviceId"));
+ list.add(batt);
+ }
+ } catch (SQLException e) {
+ // TODO Auto-generated catch block
+ e.printStackTrace();
+ }
+ return list;
+ }
+ } );
+ return list;
+ }
+
+
+ //鏍规嵁鏈烘埧id鏌ヨ鏈烘埧涓嬬殑鐢垫睜缁勪俊鎭�(宸︿晶瀵艰埅绗洓灞�,鏍规嵁鏈烘埧鏌ヨ涓嬮潰鐨勭數姹犵粍,num涓瓨鏀緐id)
public List serchBattByStation(Object obj){
BattInf binf=(BattInf) obj;
String sql="select DISTINCT StationName,StationId,StationIP,FBSDeviceId,BattGroupName,BattGroupName1,BattGroupName2,MonCount,battgroupId,MonCapStd,MonVolStd,MonResStd,MonSerStd,BattProducer,BattInUseDate,GroupIndexInFBSDevice " +
- "from db_battinf.tb_battinf where stationid=? " +
- "ORDER BY StationName1,battgroupId ";
- List list=DAOHelper.executeQuery(sql, DBUtil.getConn(),new Object[]{binf.getStationId()},new CallBack() {
+ "from db_battinf.tb_battinf where StationName1 like ? and StationName2 like ? and StationName like ? ";
+ //鏈烘埧id
+ String idSqlT=" and Stationid like ? ";
+ sql+=idSqlT;
+ //鐢ㄦ埛绠＄悊
+ String userSql=" and StationId in(" +
+ " select distinct db_user.tb_user_battgroup_baojigroup_battgroup.StationId from db_user.tb_user_battgroup_baojigroup_battgroup,db_user.tb_user_battgroup_baojigroup_usr where db_user.tb_user_battgroup_baojigroup_battgroup.baoji_group_id=db_user.tb_user_battgroup_baojigroup_usr.baoji_group_id and db_user.tb_user_battgroup_baojigroup_usr.uId=?" +
+ " ) ";
+ sql+=userSql;
+ //鎺掑簭
+ String orderSql=" ORDER BY StationName1,battgroupId ";
+ //System.out.println(sql);
+ List list=DAOHelper.executeQuery(sql, DBUtil.getConn(),new Object[]{"%"+binf.getStationName1()+"%","%"+binf.getStationName2()+"%","%"+binf.getStationName()+"%","%"+binf.getStationId()+"%",binf.getNum()},new CallBack() {
public List getResults(ResultSet rs) {
List list = new ArrayList();
- String conStr="-";//杩炴帴鏈烘埧鍚嶇О鐨勭鍙�
try {
while (rs.next()) {
BattInf batt = new BattInf();
@@ -3439,7 +3475,7 @@
BattInfImpl biml = new BattInfImpl();
BattInf binf = new BattInf();
- binf.setBattGroupId(0);
+ binf.setBattGroupId(1000967);
binf.setStationName("鍐呰挋鍙�");
binf.setStationName1("鍐呰挋鍙�");
@@ -3466,7 +3502,8 @@
bmd.setUinf(uinf);
//List<BattInf> list = biml.serchByConditionNew(bmd);
//List<BattInf> list=biml.serchByTestType(bmd);
- List<BattInf> list=biml.serchGroupAssess(bmd);
+ //List<BattInf> list=biml.serchGroupAssess(bmd);
+ List<BattInf> list=biml.serchByMonNum(binf);
for (BattInf b : list) {
System.out.println(b);
}
--
Gitblit v1.9.1