From 104cf721e069d81f0874b32465a273d8e63e539c Mon Sep 17 00:00:00 2001
From: 81041 <81041@DESKTOP-025NVD9>
Date: 星期六, 05 一月 2019 10:37:44 +0800
Subject: [PATCH] 修改

---
 gx_tieta/src/com/fgkj/dao/impl/BattInfImpl.java |   14 +++++++++++---
 1 files changed, 11 insertions(+), 3 deletions(-)

diff --git a/gx_tieta/src/com/fgkj/dao/impl/BattInfImpl.java b/gx_tieta/src/com/fgkj/dao/impl/BattInfImpl.java
index 7c33d1d..e2c4b09 100644
--- a/gx_tieta/src/com/fgkj/dao/impl/BattInfImpl.java
+++ b/gx_tieta/src/com/fgkj/dao/impl/BattInfImpl.java
@@ -90,6 +90,14 @@
 				}
 				maxb++;
 				sql_str.add(sql);
+				
+				String baoji_sql_main="REPLACE into db_user.tb_user_battgroup_baojigroup_battgroup(baoji_group_id,StationId,BattGroupId) values('100011','"+binf.getStationId()+"',"+binf.getBattGroupId()+")";
+			    sql_str.add(baoji_sql_main);
+			    
+		   	   // System.out.println(baoji_sql_main);
+				String baoji_sql="REPLACE into db_user.tb_user_battgroup_baojigroup_battgroup(baoji_group_id,StationId,BattGroupId) " + 
+	    		         " SELECT baoji_group_id,'"+binf.getStationId()+"',"+binf.getBattGroupId()+" from  db_user.tb_user_battgroup_baojigroup_usr where uid="+((User_inf)ActionUtil.getUser()).getUId();
+	            sql_str.add(baoji_sql);
 				{
 					String msg="娣诲姞"+binf.getStationName()+"鏈烘埧"+binf.getBattGroupId()+"鐢垫睜缁勭殑淇℃伅";
 					User_log ulog=UinfDaoFactory.CreateULog(UinfDaoFactory.Increase, msg);
@@ -4381,7 +4389,7 @@
 		/*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,"
-				+ "FBSDeviceName,GroupIndexInFBSDevice,db_battinf.tb_battinf.battgroupId,BattGroupNum" +
+				+ "FBSDeviceName,GroupIndexInFBSDevice,db_battinf.tb_battinf.battgroupId,battGroupName" +
 				 ",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 "
@@ -4438,8 +4446,8 @@
 						binf.setFBSDeviceName(rs.getString("fBSDeviceName"));
 						binf.setGroupIndexInFBSDevice(rs.getInt("groupIndexInFBSDevice"));
 						binf.setBattGroupId(rs.getInt("battGroupId"));
-						/*binf.setBattGroupNum(rs.getInt("battGroupNum"));
 						binf.setBattGroupName(rs.getString("battGroupName"));
+						/*binf.setBattGroupNum(rs.getInt("battGroupNum"));
 						binf.setFloatVolLevel(rs.getFloat("floatVolLevel"));
 						binf.setOfflineVolLevel(rs.getFloat("offlineVolLevel"));
 						binf.setBattFloatCurrent(rs.getFloat("battFloatCurrent"));*/
@@ -4479,7 +4487,7 @@
 		}*/
 		return list;
 	}
-
+    
 	public static void main(String[] args) throws ParseException {
 		//new BattInfImpl().searchAll();
 		

--
Gitblit v1.9.1