From 030de8f10eee755bb99fd4b2de83f09e6be6ae72 Mon Sep 17 00:00:00 2001
From: didiyu <1293722656@qq.com>
Date: 星期二, 27 十一月 2018 16:06:12 +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/BattInfImpl.java | 20 +++++++++++++-------
1 files changed, 13 insertions(+), 7 deletions(-)
diff --git a/gx_tieta/src/com/fgkj/dao/impl/BattInfImpl.java b/gx_tieta/src/com/fgkj/dao/impl/BattInfImpl.java
index 0e2c5b6..0586a20 100644
--- a/gx_tieta/src/com/fgkj/dao/impl/BattInfImpl.java
+++ b/gx_tieta/src/com/fgkj/dao/impl/BattInfImpl.java
@@ -139,7 +139,13 @@
boolean bl=DAOHelper.executeUpdate(DBUtil.getConn(), sql, null);
return bl;
}
-
+ //璁剧疆鐢垫睜缁勫厖鐢电數娴侀槇鍊�
+ public boolean update_charge(Object obj){
+ BattInf binf=(BattInf) obj;
+ String sql = "update db_battinf.tb_battinf set charge_curr_max=? where BattGroupId=?";
+ boolean bl=DAOHelper.executeUpdate(DBUtil.getConn(), sql, new Object[]{binf.getCharge_curr_max(),binf.getBattGroupId()});
+ return bl;
+ }
//鍒犻櫎鐢垫睜缁�(澶氫釜)
public boolean del(Object obj) {
List<BattInf> list=(List<BattInf>) obj;
@@ -1077,11 +1083,11 @@
public int serchByDeviceId(Object obj){
User_inf uinf=(User_inf) obj;
String sql=" SELECT COUNT(DISTINCT fbsdeviceid) number FROM db_battinf.tb_battinf " +
- " left outer join db_user.tb_user_battgroup_baojigroup_battgroup on db_user.tb_user_battgroup_baojigroup_battgroup.BattGroupId=db_battinf.tb_battinf.BattGroupId " +
- " left outer join db_user.tb_user_battgroup_baojigroup_usr on db_user.tb_user_battgroup_baojigroup_usr.baoji_group_id=db_user.tb_user_battgroup_baojigroup_battgroup.baoji_group_id " +
- " left outer join db_user.tb_user_inf on tb_user_inf.uid=db_user.tb_user_battgroup_baojigroup_usr.uid " +
- " where db_user.tb_user_inf.uid=? and db_battinf.tb_battinf.Station_install=1 " +
- " limit 1";
+ " 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 db_battinf.tb_battinf.station_install=1";
List<BattInf> list=DAOHelper.executeQuery(sql, DBUtil.getConn(), new Object[]{uinf.getUId()}, new CallBack() {
public List getResults(ResultSet rs) {
@@ -1114,7 +1120,7 @@
" left outer join db_user.tb_user_battgroup_baojigroup_usr on db_user.tb_user_battgroup_baojigroup_usr.baoji_group_id=db_user.tb_user_battgroup_baojigroup_battgroup.baoji_group_id " +
" left outer join db_user.tb_user_inf on tb_user_inf.uid=db_user.tb_user_battgroup_baojigroup_usr.uid " +
" where db_user.tb_user_inf.uid=? " +
- " limit 1";
+ " limit 1 ";
List<BattInf> list=DAOHelper.executeQuery(sql, DBUtil.getConn(), new Object[]{uinf.getUId()}, new CallBack() {
public List getResults(ResultSet rs) {
--
Gitblit v1.9.1