From 6382c2a4220ff5774dba39848c2faabf0f7002f1 Mon Sep 17 00:00:00 2001
From: didiyu <1293722656@qq.com>
Date: 星期一, 10 十二月 2018 10:39:42 +0800
Subject: [PATCH] Merge branch 'dev_lxw' of https://didiyu@gitlab.com/whyclxw1/gx_tieta.git into dev_lxw
---
gx_tieta/src/com/fgkj/dao/impl/BadBatt_monImpl.java | 44 ++++++++++++++++++++++++++++++++++++++------
1 files changed, 38 insertions(+), 6 deletions(-)
diff --git a/gx_tieta/src/com/fgkj/dao/impl/BadBatt_monImpl.java b/gx_tieta/src/com/fgkj/dao/impl/BadBatt_monImpl.java
index 0d3825a..929f9f1 100644
--- a/gx_tieta/src/com/fgkj/dao/impl/BadBatt_monImpl.java
+++ b/gx_tieta/src/com/fgkj/dao/impl/BadBatt_monImpl.java
@@ -304,8 +304,8 @@
"and db_battinf.tb_battinf.stationname1 like ? and db_battinf.tb_battinf.stationname like ? and db_battinf.tb_battinf.stationname2 like ? and db_battinf.tb_battinf.stationname5 like ? ";
//閫夊彇钃勭數姹犵粍鏉′欢
- String idSqlT=" and db_battinf.tb_battinf.battgroupid!=? ";
- String idSqlF=" and db_battinf.tb_battinf.battgroupid=? ";
+ String idSqlT=" and db_battinf.tb_battinf.battgroupid!=? and db_battinf.tb_battinf.Station_install=1 ";
+ String idSqlF=" and db_battinf.tb_battinf.battgroupid=? and db_battinf.tb_battinf.Station_install=1 ";
if(binf.getBattGroupId()==0){
baseSql+=idSqlT;
}else{
@@ -377,8 +377,38 @@
}
return list;
}
-
-
+
+ //鏌ヨ瀛樺湪钀藉悗鍗曚綋寰楁満鎴夸釜鏁�
+ public int searchBadBattInStation(Object obj) {
+ User_inf uinf=(User_inf) obj;
+ String sql=" select count(distinct db_battinf.tb_battinf.stationid) as nums from db_battinf.tb_battinf where station_install=1 " +
+ " and db_battinf.tb_battinf.battgroupid in (select distinct tb_badbatt_mon.BattGroupId from web_site.tb_badbatt_mon) " +
+ " and db_battinf.tb_battinf.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=? ) ";
+ //System.out.println(sql);
+ List list=DAOHelper.executeQuery(sql, DBUtil.getConn(), new Object[]{uinf.getUId()}, new CallBack() {
+
+ public List getResults(ResultSet rs) {
+ List list=new ArrayList();
+ try {
+ while(rs.next()){
+ list.add(rs.getInt("nums"));
+ }
+ } catch (SQLException e) {
+ // TODO Auto-generated catch block
+ e.printStackTrace();
+ }
+ return list;
+ }
+ });
+ int nums=0;//鏈�鍚庣殑缁撴灉
+ if(list!=null&&list.size()>0){
+ nums=(Integer) list.get(list.size()-1);
+ }
+ return nums;
+ }
public static void main(String[] args) throws ParseException {
SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd");
Date date1 = sdf.parse("2000-01-01");
@@ -410,10 +440,12 @@
bmd.setBinf(binf);
bmd.setPage(page);
bmd.setUinf(uinf);
- List<Batt_Maint_Dealarm> list=bimpl.serchByInfo(bmd);
+ /*List<Batt_Maint_Dealarm> list=bimpl.serchByInfo(bmd);
for (Batt_Maint_Dealarm b : list) {
System.out.println(b);
- }
+ }*/
+ int nums=bimpl.searchBadBattInStation(uinf);
+ System.out.println(nums);
}
--
Gitblit v1.9.1