From 3ac6b59462480ed05f6d33c7ddf4363b6b202690 Mon Sep 17 00:00:00 2001
From: whyclj <1525436766@qq.com>
Date: 星期三, 02 一月 2019 11:27:51 +0800
Subject: [PATCH] 修改电池信息配置页面对应的权限
---
gx_tieta/src/com/fgkj/dao/impl/Battinf_applyImpl.java | 7 ++++---
1 files changed, 4 insertions(+), 3 deletions(-)
diff --git a/gx_tieta/src/com/fgkj/dao/impl/Battinf_applyImpl.java b/gx_tieta/src/com/fgkj/dao/impl/Battinf_applyImpl.java
index bc32ce1..2cf11c7 100644
--- a/gx_tieta/src/com/fgkj/dao/impl/Battinf_applyImpl.java
+++ b/gx_tieta/src/com/fgkj/dao/impl/Battinf_applyImpl.java
@@ -94,7 +94,7 @@
int uid=((User_inf)ActionUtil.getUser()).getUId();
bapply.setApply_uid(uid);
BattInf binf=bapply.getBinf();
- String sql = "insert into db_battinf.tb_battinf_apply(" +
+ String sql = "replace into db_battinf.tb_battinf_apply(" +
"apply_uid,apply_date,StationId,StationName,StationName1,StationName2,StationName3,StationName4,StationName5,StationIp,FBSDeviceId,FbsDeviceIp,FbsDeviceIp_YM,FbsDeviceIp_WG,"
+ "FBSDeviceName,GroupIndexInFBSDevice,battgroupId,BattGroupNum,BattGroupName,FloatVolLevel,OfflineVolLevel,BattFloatCurrent" +
",MonCount,MonCapStd,monVolStd,monResStd,MonSerStd,MonVolLowToAvg,BattProducer,BattModel,BattProductDate,BattInUseDate,Load_curr,install_user,DisCurrMax,station_phone" +
@@ -139,7 +139,7 @@
",'"+binf.getBattProducer()+"','"+binf.getBattModel()+"','"+DAOHelper.sdf.format(binf.getBattProductDate())+"','"+DAOHelper.sdf.format(binf.getBattInUseDate())+"',"+binf.getLoad_curr()+",'"+binf.getInstall_user()+"',"+binf.getDisCurrMax()+",'"+binf.getStation_phone()+"',"+binf.getStation_install()+")";
sql_str.add(sql_insert_binf);
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 ";
+ " SELECT baoji_group_id,'"+binf.getStationId()+"',"+binf.getBattGroupId()+" from db_user.tb_user_battgroup_baojigroup_usr where uid="+bapply.getApply_uid();
sql_str.add(baoji_sql);
{
String msg="纭娣诲姞"+binf.getStationName()+"鏈烘埧"+binf.getBattGroupId()+"鐢垫睜缁勭殑淇℃伅";
@@ -717,7 +717,7 @@
}
//鐢宠琛ㄤ腑宸插鎵归�氳繃鐨勮澶囪繛鎺ユ暟
public List devCommNum() {
- String sql=" select distinct db_battinf.tb_battinf_apply.FbsDeviceId,dev_commcount " +
+ String sql=" select distinct db_battinf.tb_battinf_apply.FbsDeviceId,dev_commcount,dev_errcommcount " +
" from db_battinf.tb_battinf_apply,db_ram_db.tb_fbs9100_state " +
" where apply_en=1 and db_battinf.tb_battinf_apply.FbsDeviceId=db_ram_db.tb_fbs9100_state.dev_id "
+ " order by apply_date desc" ;
@@ -731,6 +731,7 @@
Fbs9100_state fbs=new Fbs9100_state();
fbs.setDev_id(rs.getInt("FbsDeviceId"));
fbs.setDev_commcount(rs.getInt("dev_commcount"));
+ fbs.setDev_errcommcount(rs.getInt("dev_errcommcount"));
list.add(fbs);
}
} catch (SQLException e) {
--
Gitblit v1.9.1