From 12c384847af42270e2ba167467173a928a59ded2 Mon Sep 17 00:00:00 2001
From: didiyu <1293722656@qq.com>
Date: 星期四, 29 十一月 2018 10:05:03 +0800
Subject: [PATCH] Merge branch 'dev_lxw' of https://didiyu@gitlab.com/whyclxw1/gx_tieta.git into dev_lxw
---
gx_tieta/WebRoot/js/base.js | 2
gx_tieta/WebRoot/index.jsp | 7
gx_tieta/src/com/fgkj/services/ram/Fbs9100_battparamService.java | 56 +++
gx_tieta/src/com/fgkj/dto/ram/Fbs9100s_dfu_state.java | 24 +
gx_tieta/src/com/fgkj/dao/impl/BattInfImpl.java | 40 ++
gx_tieta/src/com/fgkj/dao/impl/ram/Fbs9100s_dfu_stateImpl.java | 49 +
gx_tieta/.settings/org.jboss.tools.jst.web.xml | 68 +-
gx_tieta/WebRoot/Top.jsp | 75 +++
gx_tieta/src/com/fgkj/dao/BaseDAOFactory.java | 2
gx_tieta/WebRoot/control.jsp | 199 ++++++++++
gx_tieta/src/com/fgkj/dto/Fbsdev_Statechange_inf.java | 36 +
gx_tieta/src/com/fgkj/dao/BaseDAO.java | 2
gx_tieta/WebRoot/batt-station-update1.jsp | 25 +
gx_tieta/WebRoot/js/dischargetest/battData.js | 297 ++++++++++++++++
gx_tieta/src/com/fgkj/actions/BattInfAction.java | 15
gx_tieta/src/com/fgkj/dao/FBS9100_ComBase.java | 6
gx_tieta/src/com/fgkj/dao/impl/ram/Fbs9100_battparamImpl.java | 86 ++++
gx_tieta/WebRoot/pages/js/common.js | 5
gx_tieta/src/com/fgkj/dao/impl/Fbsdev_Statechange_infImpl.java | 4
gx_tieta/src/com/fgkj/services/BattInfServices.java | 17
gx_tieta/src/com/fgkj/actions/ram/Fbs9100_battparamAction.java | 62 +++
21 files changed, 967 insertions(+), 110 deletions(-)
diff --git a/gx_tieta/.settings/org.jboss.tools.jst.web.xml b/gx_tieta/.settings/org.jboss.tools.jst.web.xml
index ab7f92f..7ad3e7b 100644
--- a/gx_tieta/.settings/org.jboss.tools.jst.web.xml
+++ b/gx_tieta/.settings/org.jboss.tools.jst.web.xml
@@ -9,73 +9,73 @@
<file-system NAME="classes" location="%workspace.home%/classes" model-entity="FileSystemFolder"/>
<file-system NAME="fuguang" location="%eclipse.project%" model-entity="FileSystemFolder"/>
<file-system NAME="lib-javaee.jar"
- location="D:\Program Files\MyEclipse\Common\plugins\com.genuitec.eclipse.j2eedt.core_10.0.0.me201110301321\data\libraryset\EE_5\javaee.jar" model-entity="FileSystemJar"/>
+ location="D:\MyEclipse\Common\plugins\com.genuitec.eclipse.j2eedt.core_10.0.0.me201110301321\data\libraryset\EE_5\javaee.jar" model-entity="FileSystemJar"/>
<file-system NAME="lib-jsf-impl.jar"
- location="D:\Program Files\MyEclipse\Common\plugins\com.genuitec.eclipse.j2eedt.core_10.0.0.me201110301321\data\libraryset\EE_5\jsf-impl.jar" model-entity="FileSystemJar"/>
+ location="D:\MyEclipse\Common\plugins\com.genuitec.eclipse.j2eedt.core_10.0.0.me201110301321\data\libraryset\EE_5\jsf-impl.jar" model-entity="FileSystemJar"/>
<file-system NAME="lib-jsf-api.jar"
- location="D:\Program Files\MyEclipse\Common\plugins\com.genuitec.eclipse.j2eedt.core_10.0.0.me201110301321\data\libraryset\EE_5\jsf-api.jar" model-entity="FileSystemJar"/>
+ location="D:\MyEclipse\Common\plugins\com.genuitec.eclipse.j2eedt.core_10.0.0.me201110301321\data\libraryset\EE_5\jsf-api.jar" model-entity="FileSystemJar"/>
<file-system NAME="lib-jstl-1.2.jar"
- location="D:\Program Files\MyEclipse\Common\plugins\com.genuitec.eclipse.j2eedt.core_10.0.0.me201110301321\data\libraryset\EE_5\jstl-1.2.jar" model-entity="FileSystemJar"/>
+ location="D:\MyEclipse\Common\plugins\com.genuitec.eclipse.j2eedt.core_10.0.0.me201110301321\data\libraryset\EE_5\jstl-1.2.jar" model-entity="FileSystemJar"/>
<file-system NAME="lib-c3p0-0.9.5.jar"
- location="C:\Users\LiJun\git\gx_tieta\gx_tieta\lib\c3p0-0.9.5.jar" model-entity="FileSystemJar"/>
+ location="D:\GitWorkSpace\gx_tieta\gx_tieta\lib\c3p0-0.9.5.jar" model-entity="FileSystemJar"/>
<file-system NAME="lib-c3p0-oracle-thin-extras-0.9.5.jar"
- location="C:\Users\LiJun\git\gx_tieta\gx_tieta\lib\c3p0-oracle-thin-extras-0.9.5.jar" model-entity="FileSystemJar"/>
+ location="D:\GitWorkSpace\gx_tieta\gx_tieta\lib\c3p0-oracle-thin-extras-0.9.5.jar" model-entity="FileSystemJar"/>
<file-system NAME="lib-mchange-commons-java-0.2.9.jar"
- location="C:\Users\LiJun\git\gx_tieta\gx_tieta\lib\mchange-commons-java-0.2.9.jar" model-entity="FileSystemJar"/>
+ location="D:\GitWorkSpace\gx_tieta\gx_tieta\lib\mchange-commons-java-0.2.9.jar" model-entity="FileSystemJar"/>
<file-system NAME="lib-resources.jar"
- location="D:\Program Files\MyEclipse\Common\binary\com.sun.java.jdk.win32.x86_64_1.6.0.013\jre\lib\resources.jar" model-entity="FileSystemJar"/>
+ location="D:\MyEclipse\Common\binary\com.sun.java.jdk.win32.x86_64_1.6.0.013\jre\lib\resources.jar" model-entity="FileSystemJar"/>
<file-system NAME="lib-dnsns.jar"
- location="D:\Program Files\MyEclipse\Common\binary\com.sun.java.jdk.win32.x86_64_1.6.0.013\jre\lib\ext\dnsns.jar" model-entity="FileSystemJar"/>
+ location="D:\MyEclipse\Common\binary\com.sun.java.jdk.win32.x86_64_1.6.0.013\jre\lib\ext\dnsns.jar" model-entity="FileSystemJar"/>
<file-system NAME="lib-localedata.jar"
- location="D:\Program Files\MyEclipse\Common\binary\com.sun.java.jdk.win32.x86_64_1.6.0.013\jre\lib\ext\localedata.jar" model-entity="FileSystemJar"/>
+ location="D:\MyEclipse\Common\binary\com.sun.java.jdk.win32.x86_64_1.6.0.013\jre\lib\ext\localedata.jar" model-entity="FileSystemJar"/>
<file-system NAME="lib-sunjce_provider.jar"
- location="D:\Program Files\MyEclipse\Common\binary\com.sun.java.jdk.win32.x86_64_1.6.0.013\jre\lib\ext\sunjce_provider.jar" model-entity="FileSystemJar"/>
+ location="D:\MyEclipse\Common\binary\com.sun.java.jdk.win32.x86_64_1.6.0.013\jre\lib\ext\sunjce_provider.jar" model-entity="FileSystemJar"/>
<file-system NAME="lib-commons-beanutils-1.7.0.jar"
- location="C:\Users\LiJun\git\gx_tieta\gx_tieta\WebRoot\WEB-INF\lib\commons-beanutils-1.7.0.jar" model-entity="FileSystemJar"/>
+ location="D:\GitWorkSpace\gx_tieta\gx_tieta\WebRoot\WEB-INF\lib\commons-beanutils-1.7.0.jar" model-entity="FileSystemJar"/>
<file-system NAME="lib-commons-codec-1.10.jar"
- location="C:\Users\LiJun\git\gx_tieta\gx_tieta\WebRoot\WEB-INF\lib\commons-codec-1.10.jar" model-entity="FileSystemJar"/>
+ location="D:\GitWorkSpace\gx_tieta\gx_tieta\WebRoot\WEB-INF\lib\commons-codec-1.10.jar" model-entity="FileSystemJar"/>
<file-system NAME="lib-commons-collections-3.1.jar"
- location="C:\Users\LiJun\git\gx_tieta\gx_tieta\WebRoot\WEB-INF\lib\commons-collections-3.1.jar" model-entity="FileSystemJar"/>
+ location="D:\GitWorkSpace\gx_tieta\gx_tieta\WebRoot\WEB-INF\lib\commons-collections-3.1.jar" model-entity="FileSystemJar"/>
<file-system NAME="lib-commons-dbcp-1.2.1.jar"
- location="C:\Users\LiJun\git\gx_tieta\gx_tieta\WebRoot\WEB-INF\lib\commons-dbcp-1.2.1.jar" model-entity="FileSystemJar"/>
+ location="D:\GitWorkSpace\gx_tieta\gx_tieta\WebRoot\WEB-INF\lib\commons-dbcp-1.2.1.jar" model-entity="FileSystemJar"/>
<file-system NAME="lib-commons-fileupload-1.2.2.jar"
- location="C:\Users\LiJun\git\gx_tieta\gx_tieta\WebRoot\WEB-INF\lib\commons-fileupload-1.2.2.jar" model-entity="FileSystemJar"/>
+ location="D:\GitWorkSpace\gx_tieta\gx_tieta\WebRoot\WEB-INF\lib\commons-fileupload-1.2.2.jar" model-entity="FileSystemJar"/>
<file-system NAME="lib-commons-io-2.0.1.jar"
- location="C:\Users\LiJun\git\gx_tieta\gx_tieta\WebRoot\WEB-INF\lib\commons-io-2.0.1.jar" model-entity="FileSystemJar"/>
+ location="D:\GitWorkSpace\gx_tieta\gx_tieta\WebRoot\WEB-INF\lib\commons-io-2.0.1.jar" model-entity="FileSystemJar"/>
<file-system NAME="lib-commons-lang-2.5.jar"
- location="C:\Users\LiJun\git\gx_tieta\gx_tieta\WebRoot\WEB-INF\lib\commons-lang-2.5.jar" model-entity="FileSystemJar"/>
+ location="D:\GitWorkSpace\gx_tieta\gx_tieta\WebRoot\WEB-INF\lib\commons-lang-2.5.jar" model-entity="FileSystemJar"/>
<file-system NAME="lib-commons-pool-1.2.jar"
- location="C:\Users\LiJun\git\gx_tieta\gx_tieta\WebRoot\WEB-INF\lib\commons-pool-1.2.jar" model-entity="FileSystemJar"/>
+ location="D:\GitWorkSpace\gx_tieta\gx_tieta\WebRoot\WEB-INF\lib\commons-pool-1.2.jar" model-entity="FileSystemJar"/>
<file-system NAME="lib-dom4j-1.6.1.jar"
- location="C:\Users\LiJun\git\gx_tieta\gx_tieta\WebRoot\WEB-INF\lib\dom4j-1.6.1.jar" model-entity="FileSystemJar"/>
+ location="D:\GitWorkSpace\gx_tieta\gx_tieta\WebRoot\WEB-INF\lib\dom4j-1.6.1.jar" model-entity="FileSystemJar"/>
<file-system NAME="lib-ezmorph-1.0.3.jar"
- location="C:\Users\LiJun\git\gx_tieta\gx_tieta\WebRoot\WEB-INF\lib\ezmorph-1.0.3.jar" model-entity="FileSystemJar"/>
+ location="D:\GitWorkSpace\gx_tieta\gx_tieta\WebRoot\WEB-INF\lib\ezmorph-1.0.3.jar" model-entity="FileSystemJar"/>
<file-system NAME="lib-freemarker-2.3.16.jar"
- location="C:\Users\LiJun\git\gx_tieta\gx_tieta\WebRoot\WEB-INF\lib\freemarker-2.3.16.jar" model-entity="FileSystemJar"/>
+ location="D:\GitWorkSpace\gx_tieta\gx_tieta\WebRoot\WEB-INF\lib\freemarker-2.3.16.jar" model-entity="FileSystemJar"/>
<file-system NAME="lib-gson-2.2.4.jar"
- location="C:\Users\LiJun\git\gx_tieta\gx_tieta\WebRoot\WEB-INF\lib\gson-2.2.4.jar" model-entity="FileSystemJar"/>
+ location="D:\GitWorkSpace\gx_tieta\gx_tieta\WebRoot\WEB-INF\lib\gson-2.2.4.jar" model-entity="FileSystemJar"/>
<file-system NAME="lib-javassist-3.11.0.GA.jar"
- location="C:\Users\LiJun\git\gx_tieta\gx_tieta\WebRoot\WEB-INF\lib\javassist-3.11.0.GA.jar" model-entity="FileSystemJar"/>
+ location="D:\GitWorkSpace\gx_tieta\gx_tieta\WebRoot\WEB-INF\lib\javassist-3.11.0.GA.jar" model-entity="FileSystemJar"/>
<file-system NAME="lib-json-lib-2.1-jdk15.jar"
- location="C:\Users\LiJun\git\gx_tieta\gx_tieta\WebRoot\WEB-INF\lib\json-lib-2.1-jdk15.jar" model-entity="FileSystemJar"/>
+ location="D:\GitWorkSpace\gx_tieta\gx_tieta\WebRoot\WEB-INF\lib\json-lib-2.1-jdk15.jar" model-entity="FileSystemJar"/>
<file-system NAME="lib-mysql-connector-java-5.1.33-bin.jar"
- location="C:\Users\LiJun\git\gx_tieta\gx_tieta\WebRoot\WEB-INF\lib\mysql-connector-java-5.1.33-bin.jar" model-entity="FileSystemJar"/>
+ location="D:\GitWorkSpace\gx_tieta\gx_tieta\WebRoot\WEB-INF\lib\mysql-connector-java-5.1.33-bin.jar" model-entity="FileSystemJar"/>
<file-system NAME="lib-ognl-3.0.1.jar"
- location="C:\Users\LiJun\git\gx_tieta\gx_tieta\WebRoot\WEB-INF\lib\ognl-3.0.1.jar" model-entity="FileSystemJar"/>
+ location="D:\GitWorkSpace\gx_tieta\gx_tieta\WebRoot\WEB-INF\lib\ognl-3.0.1.jar" model-entity="FileSystemJar"/>
<file-system NAME="lib-poi-3.10.1-20140818.jar"
- location="C:\Users\LiJun\git\gx_tieta\gx_tieta\WebRoot\WEB-INF\lib\poi-3.10.1-20140818.jar" model-entity="FileSystemJar"/>
+ location="D:\GitWorkSpace\gx_tieta\gx_tieta\WebRoot\WEB-INF\lib\poi-3.10.1-20140818.jar" model-entity="FileSystemJar"/>
<file-system NAME="lib-sqljdbc.jar"
- location="C:\Users\LiJun\git\gx_tieta\gx_tieta\WebRoot\WEB-INF\lib\sqljdbc.jar" model-entity="FileSystemJar"/>
+ location="D:\GitWorkSpace\gx_tieta\gx_tieta\WebRoot\WEB-INF\lib\sqljdbc.jar" model-entity="FileSystemJar"/>
<file-system NAME="lib-struts2-core-2.2.3.jar"
- location="C:\Users\LiJun\git\gx_tieta\gx_tieta\WebRoot\WEB-INF\lib\struts2-core-2.2.3.jar" model-entity="FileSystemJar"/>
+ location="D:\GitWorkSpace\gx_tieta\gx_tieta\WebRoot\WEB-INF\lib\struts2-core-2.2.3.jar" model-entity="FileSystemJar"/>
<file-system NAME="lib-struts2-json-plugin-2.2.3.jar"
- location="C:\Users\LiJun\git\gx_tieta\gx_tieta\WebRoot\WEB-INF\lib\struts2-json-plugin-2.2.3.jar" model-entity="FileSystemJar"/>
+ location="D:\GitWorkSpace\gx_tieta\gx_tieta\WebRoot\WEB-INF\lib\struts2-json-plugin-2.2.3.jar" model-entity="FileSystemJar"/>
<file-system NAME="lib-struts2-sunspoter-stream-1.0.jar"
- location="C:\Users\LiJun\git\gx_tieta\gx_tieta\WebRoot\WEB-INF\lib\struts2-sunspoter-stream-1.0.jar" model-entity="FileSystemJar"/>
+ location="D:\GitWorkSpace\gx_tieta\gx_tieta\WebRoot\WEB-INF\lib\struts2-sunspoter-stream-1.0.jar" model-entity="FileSystemJar"/>
<file-system NAME="lib-xwork-core-2.2.3.jar"
- location="C:\Users\LiJun\git\gx_tieta\gx_tieta\WebRoot\WEB-INF\lib\xwork-core-2.2.3.jar" model-entity="FileSystemJar"/>
+ location="D:\GitWorkSpace\gx_tieta\gx_tieta\WebRoot\WEB-INF\lib\xwork-core-2.2.3.jar" model-entity="FileSystemJar"/>
<file-system NAME="lib-jacob.jar"
- location="C:\Users\LiJun\git\gx_tieta\gx_tieta\WebRoot\WEB-INF\lib\jacob.jar" model-entity="FileSystemJar"/>
+ location="D:\GitWorkSpace\gx_tieta\gx_tieta\WebRoot\WEB-INF\lib\jacob.jar" model-entity="FileSystemJar"/>
<web SERVLET_VERSION="2.4" model-entity="JstWeb" model-path="/web.xml">
<module URI="/WEB-INF/faces-config.xml" model-entity="WebJSFModule"
model-path="/faces-config.xml" src="src" web-root="WEB-ROOT"/>
diff --git a/gx_tieta/WebRoot/Top.jsp b/gx_tieta/WebRoot/Top.jsp
index 053cabe..e7add71 100644
--- a/gx_tieta/WebRoot/Top.jsp
+++ b/gx_tieta/WebRoot/Top.jsp
@@ -64,24 +64,24 @@
<div class="batt-state">
<div class="list">
- <div class="list-contain"><s:text name='Power_cut'/><s:text name='Computer_room'/><s:text name='Num'/>:<a href="batt-state-manage.jsp?station_state=2" class="badge default" id="poweroff_num">0</a></div> <!-- 鏈烘埧鍋滅數鏁� -->
+ <div class="list-contain"><s:text name='Power_cut'/><s:text name='Computer_room'/><s:text name='Num'/>:<a href="batt-state-manage.jsp?station_state=2" class="badge default" id="poweroff_num"><span class="num">0</span>/<span class="dev-num">0</span></a></div> <!-- 鏈烘埧鍋滅數鏁� -->
</div>
<div class="list">
- <div class="list-contain">缁埅涓嶈冻鏈烘埧鏁�:<a href="javascript:;" class="badge default" id="weak_home">0</a></div> <!-- 鏈烘埧缁埅涓嶈冻鏁� -->
+ <div class="list-contain">缁埅涓嶈冻鏈烘埧鏁�:<a href="javascript:;" class="badge default" id="weak_home"><span class="num">0</span>/<span class="dev-num">0</span></a></div> <!-- 鏈烘埧缁埅涓嶈冻鏁� -->
</div>
<div class="list">
- <div class="list-contain"><s:text name="Batt"/><s:text name="Alarm"/><s:text name="Num"/>:<a href="elewarn.jsp" class="badge danger" id="batt_alarm_num">0</a></div> <!-- 鐢垫睜鍛婅鏁� -->
+ <div class="list-contain"><s:text name="Batt"/><s:text name="Alarm"/><s:text name="Num"/>:<a href="elewarn.jsp" class="badge danger" id="batt_alarm_num"><span class="num">0</span>/<span class="batt-num">0</span></a></div> <!-- 鐢垫睜鍛婅鏁� -->
</div>
<div class="list">
- <div class="list-contain"><s:text name="Capacity"/><s:text name="Behind_number_monomer"/>:<a href="taskplan.jsp" class="badge default" id="batt_low_num">0</a></div> <!-- 钀藉悗鍗曚綋鏁� -->
+ <div class="list-contain"><s:text name="Capacity"/><s:text name="Behind_number_monomer"/>:<a href="taskplan.jsp" class="badge default" id="batt_low_num"><span class="num">0</span>/<span class="batt-num">0</span></a></div> <!-- 钀藉悗鍗曚綋鏁� -->
</div>
<div class="list">
- <div class="list-contain"><s:text name="Equipment"/><s:text name="Alarm"/><s:text name="Num"/> :<a href="equipWarn1.jsp" class="badge danger" id="dev_alarm_num">0</a></div> <!-- 璁惧鍛婅鏁� -->
+ <div class="list-contain"><s:text name="Equipment"/><s:text name="Alarm"/><s:text name="Num"/> :<a href="equipWarn1.jsp" class="badge danger" id="dev_alarm_num"><span class="num">0</span>/<span class="dev-num">0</span></a></div> <!-- 璁惧鍛婅鏁� -->
</div>
<div class="list">
<div class="list-contain">
- 鏍稿娴嬭瘯璁惧鏁�:<a href="javascript:void(0);" class="badge default" id="nuclear_test">0</a>
+ 鏍稿娴嬭瘯璁惧鏁�:<a href="javascript:void(0);" class="badge default" id="nuclear_test"><span class="num">0</span>/<span class="dev-num">0</span></a>
</div>
</div>
</div>
@@ -130,7 +130,7 @@
<div class="cell-list control">
<img src="image/webStatus/control_normal.gif" alt="绾跨▼鐩戞帶绋嬪簭" title="绾跨▼鐩戞帶绋嬪簭杩愯锛氭甯�">
</div>
- <div class="cell-list server-time">
+ <div class="cell-list server-time" style="white-space: nowrap">
2018-11-26 00:00:00
</div>
</div>
@@ -216,7 +216,7 @@
});
}
});
- searchAlm(); //鏌ヨ鐢垫睜鍛婅鎬绘暟
+ searchAlm(); //鏌ヨ鐢垫睜鍛婅鎬绘暟(鎴戝湪base.js閲�)
searchlowmon(); //鏌ヨ钀藉悗鍗曚綋鎬绘暟
searchpoweroff(); //鏌ヨ鏈烘埧鍋滅數鎬绘暟
searchdevalarm(); //鏌ヨ璁惧瀹炴椂鍛婅鎬绘暟
@@ -244,7 +244,7 @@
success: function(data){
data = eval("("+data+")");
var model = eval("("+data.result+")");
- $('#batt_low_num').text(model.sum);
+ $('#batt_low_num .num').text(model.sum);
setTimeout(searchlowmon, 5000);
},
error:function() {
@@ -264,7 +264,7 @@
success: function(data){
data = eval("("+data+")");
var model = eval("("+data.result+")");
- $('#poweroff_num').text(model.sum);
+ $('#poweroff_num .num').text(model.sum);
setTimeout(searchpoweroff, 5000);
},
error:function() {
@@ -284,7 +284,7 @@
success: function(data){
var model = eval("("+data.result+")");
//console.info(model);
- $('#poweroff_num').text(model.newsum);
+ $('#poweroff_num .num').text(model.newsum);
setTimeout(searchpoweroff, 5000);
},
error:function() {
@@ -304,7 +304,7 @@
success: function(data){
data = eval("("+data+")");
var model = eval("("+data.result+")");
- $('#dev_alarm_num').text(model.sum);
+ $('#dev_alarm_num .num').text(model.sum);
setTimeout(searchdevalarm, 5000);
},
error:function() {
@@ -343,9 +343,52 @@
,dataType: 'json'
,success: function(res) {
var rs = JSON.parse(res.result);
- $('#weak_home').text(rs.sum);
+ $('#weak_home .num').text(rs.sum);
setTimeout(searchWeakHome, 5000);
+ }
+ });
+ }
+
+ // 鏌ヨ鎵�鏈夌殑璁惧鏁�
+ searchAllDevNum();
+ function searchAllDevNum() {
+ $.ajax({
+ type: 'post'
+ ,async: true
+ ,url: 'BattInfAction!serchByDeviceId'
+ ,data: null
+ ,dataType: 'json'
+ ,success: function(res) {
+ var rs = JSON.parse(res.result);
+ if(rs.code == 1) {
+ var sum = rs.sum;
+ $('.batt-state .dev-num').text(sum);
+ }
+
+ // 寤舵椂鎵ц
+ setTimeout(searchAllDevNum, 5000);
+ }
+ });
+ }
+
+ // 鏌ヨ鎵�鏈夌殑鐢垫睜缁勬暟
+ searchAllEleGroupNum();
+ function searchAllEleGroupNum() {
+ $.ajax({
+ type: 'post'
+ ,async: true
+ ,url: 'BattInfAction!serchByInstall_count'
+ ,data: null
+ ,dataType: 'json'
+ ,success: function(res) {
+ var rs = JSON.parse(res.result);
+ if(rs.code == 1) {
+ var sum = rs.sum;
+ $('.batt-state .batt-num').text(sum);
+ }
+ // 寤舵椂鎵ц
+ setTimeout(searchAllEleGroupNum, 5000);
}
});
}
@@ -597,7 +640,7 @@
//鏌ヨ鐢垫睜鍛婅淇℃伅
function searchBattAlarm(data){
- console.info(data);
+ //console.info(data);
$.ajax({
type:"post",
url: "Battalarm_dataAction!serchBatt_alarm",
@@ -773,7 +816,7 @@
var model = eval('('+data.result+')');
//console.info(model);
if(model.code == 1){
- $('#nuclear_test').text(model.data.length);
+ $('#nuclear_test .num').text(model.data.length);
if(model.data.length != 0) {
if(!$('#navNuclearTest').hasClass('hide') || isNew) {
createTblByModel(model);
@@ -781,7 +824,7 @@
isNew=false;
}
}else {
- $('#nuclear_test').text(0);
+ $('#nuclear_test .num').text(0);
createFullTbl(eleTh, eleTd, arrTh, []);
}
},
diff --git a/gx_tieta/WebRoot/batt-station-update1.jsp b/gx_tieta/WebRoot/batt-station-update1.jsp
index aad2da7..db93004 100644
--- a/gx_tieta/WebRoot/batt-station-update1.jsp
+++ b/gx_tieta/WebRoot/batt-station-update1.jsp
@@ -134,6 +134,11 @@
<a class="layui-btn layui-btn-xs" lay-event="update">鍗囩骇</a>
{{# } }}
</script>
+ <script type="text/html" id="upProgress">
+ <div class="layui-progress layui-progress-big" lay-showpercent="true" lay-filter="upload{{d.fbsid}}" style="margin-top:6px">
+ <div class="layui-progress-bar" lay-percent="0%"></div>
+ </div>
+ </script>
<script type="text/javascript" src="js/jquery-1.8.3.js"></script>
<script type="text/javascript" src="js/echarts.js"></script>
<script type="text/javascript" src="jqueryui/jquery-ui.min.js"></script>
@@ -145,6 +150,7 @@
var table = layui.table; // 鑾峰彇琛ㄦ牸妯″潡
var form = layui.form; // 鑾峰彇琛ㄥ崟妯″潡
var layer = layui.layer; // 鑾峰彇寮瑰嚭妗嗘ā鍧�
+ var element = layui.element; // 鑾峰彇鍏冪礌鎿嶄綔妯″潡
var isNewLoad = true;
var pre_province = getQueryString('province');
@@ -377,6 +383,7 @@
,{field:'fbsname', title:'璁惧鍚嶇О', align:'center'}
,{field:'updatestatus', title:'鍗囩骇鐘舵��', align:'center'}
,{field:'status', title:'璇诲啓鐘舵��', align:'center'}
+ ,{field:'progress', title:'涓婁紶杩涘害', align: 'center', templet:'#upProgress'}
,{field:'datapackage', title:'褰撳墠鏁版嵁鍖�', align:'center'}
,{fixed: 'right', title:'鎿嶄綔', align:'center', toolbar: '#barDemo', width:100}
]]
@@ -506,6 +513,7 @@
// 鐢熸垚琛ㄦ牸鏁版嵁
table.render(tOptions);
+ renderTblPorgess(allData);
}else {
layer.msg('娌℃湁瑕佹坊鍔犵殑鍐呭锛�');
}
@@ -620,14 +628,13 @@
for(var i=0; i<rs.data.length; i++) {
var _data = rs.data[i];
var num = -1;
- // 閬嶅巻鐜版湁鐨則blData
+ // 閬嶅巻鐜版湁鐨則blData/鏍规嵁琛ㄦ牸鐨勮鍒玦d瀵硅幏鍙栧埌鍊艰繘琛屾帓搴忎互渚垮搴旇〃鏍煎唴瀹�
for(var k=0; k<tblData.length;k++) {
var _tblData = tblData[k];
if(_tblData.fbsid == _data.dev_id) {
num = k;
break;
}
-
}
if(num == -1) {
@@ -652,7 +659,7 @@
tmp.datapackage[num] = dfuData;
}
var pageTbl = $('#pageTbl');
-
+ //console.log(tmp);
// 鏇存柊琛ㄦ牸鍐呭
Object.keys(tmp).forEach(function(key) {
updateLayuiTblCol(pageTbl, key, tmp[key]);
@@ -876,6 +883,18 @@
});
}
+
+ // 娓叉煋杩涘害鏉�
+ function renderTblPorgess(tblData) {
+ // 閬嶅巻tblData鏍规嵁fbsid娓叉煋杩涘害鏉�
+ for(var i=0; i<tblData.length; i++) {
+ var fbsid = tblData[i].fbsid;
+
+ // 娓叉煋杩涘害鏉�
+ element.render('progress', 'upload'+fbsid);
+ }
+
+ }
});
</script>
</body>
diff --git a/gx_tieta/WebRoot/control.jsp b/gx_tieta/WebRoot/control.jsp
index 5e1f4ce..bffa62a 100644
--- a/gx_tieta/WebRoot/control.jsp
+++ b/gx_tieta/WebRoot/control.jsp
@@ -252,7 +252,12 @@
<br>
<a href="javascript:void(0);" id="stopTest" class="whyc-btn whyc-btn-disabled" id="specialGraphExport">
<span class="whyc-btn-icon fa fa-stop-circle"></span>
- <span class="whyc-btn-txt" id="stopTestBtn">鍋滄娴嬭瘯</span>
+ <span class="whyc-btn-txt">鍋滄娴嬭瘯</span>
+ </a>
+ <br>
+ <a href="javascript:void(0);" id="battInfoBtn" class="whyc-btn whyc-btn-disabled" id="specialGraphExport">
+ <span class="whyc-btn-icon fa fa-battery-full"></span>
+ <span class="whyc-btn-txt">鐢垫睜鍙傛暟</span>
</a>
<br>
<a href="javascript:void(0);" id="sysSet" class="whyc-btn whyc-btn-disabled" id="specialGraphExport">
@@ -1064,6 +1069,78 @@
<input type="button" name="" id="sysSet_en" class="status-change-set " value="璁剧疆" >
</div>
</div>
+ <!-- 鐢垫睜鍙傛暟 -->
+ <div class="popup" id="battInfo_popup">
+ <div class="popup-title"><span>鐢垫睜鍙傛暟璁剧疆</span> <a href="javascript:;" class="close">X</a></div>
+ <div class="popup-content">
+ <div class="popup-tbl">
+ <input type="hidden" id="battInfo_dev_id" value=""> <!-- dev_id -->
+ <input type="hidden" id="battInfo_ip" value=""> <!-- IP鍦板潃 -->
+ <table>
+ <tbody>
+ <tr>
+ <th>璁惧ID</th>
+ <th>鏈烘埧鍚嶇О</th>
+ </tr>
+ <tr>
+ <td><input type="text" id="battInfo_fbs_id" readonly="readonly" value=""></td>
+ <td><input type="text" id="battInfo_home_name" readonly="readonly" value=""></td>
+ </tr>
+ <tr>
+ <th>鐢垫睜鏍囩О瀹归噺锛�1~6000.0AH锛�</th>
+ <th>鐢垫睜鏍囩О鍐呴樆锛�1~60000u惟锛�</th>
+ </tr>
+ <tr>
+ <td><input type="text" id="battInfo_nom_cap" value=""></td>
+ <td><input type="text" id="battInfo_nom_res" value=""></td>
+ </tr>
+ <tr>
+ <th>鐢垫睜缁勬暟锛�1~2锛�</th>
+ <th>姣忕粍鐢垫睜鍗曚綋鏁伴噺锛�1~300 锛�</th>
+ </tr>
+ <tr>
+ <td><input type="text" id="battInfo_batt_num" value=""></td>
+ <td><input type="text" id="battInfo_batt_mon_num" value=""></td>
+ </tr>
+ <tr>
+ <th>鍗曚綋鏍囩О鐢靛帇锛�0.1~20.0V锛�</th>
+ <th>鐢垫睜缁勭鏍囩О鐢靛帇锛�0.1~600.0V锛�</th>
+ </tr>
+ <tr>
+ <td><input type="text" id="battInfo_batt_nom_vol" value=""></td>
+ <td><input type="text" id="battInfo_group_nom_vol" value=""></td>
+ </tr>
+ <tr>
+ <th>鐢垫睜鏍囩О娓╁害锛�0.1~60.0鈩冿級</th>
+ <th>鐢垫睜娴厖鐢靛帇闃�鍊硷紙0.1~60.0V锛�</th>
+ </tr>
+ <tr>
+ <td><input type="text" id="battInfo_batt_nom_temp" value=""></td>
+ <td><input type="text" id="battInfo_batt_float_vol" value=""></td>
+ </tr>
+ <tr>
+ <th>鐢垫睜娴厖鐢垫祦闃�鍊硷紙0.1~30.0A锛�</th>
+ <th>鍦ㄧ嚎鐢靛帇浣庨榾鍊硷紙0.1~60.0V锛�</th>
+ </tr>
+ <tr>
+ <td><input type="text" id="battInfo_batt_float_curr" value=""></td>
+ <td><input type="text" id="battInfo_online_low_vol" value=""></td>
+ </tr>
+ <tr>
+ <th>鐢垫睜缁勮繛鎺ョ被鍨�(0~1)</th>
+ </tr>
+ <tr>
+ <td><input type="text" id="battInfo_batt_link_type" value=""></td>
+ </tr>
+ </tbody>
+ </table>
+ </div>
+ </div>
+ <div class="popup-footer">
+ <input type="button" name="" id="battInfo_read" value="璇诲彇" >
+ <input type="button" name="" id="battInfo_en" class="status-change-set whyc-btn-disabled" value="璁剧疆" >
+ </div>
+ </div>
<!-- 鍗曚綋鏇茬嚎 -->
<div class="popup w960 mr480x" id="monLineGraphPopup">
@@ -1172,6 +1249,7 @@
<script type="text/javascript" src="js/dischargetest/bts.js"></script>
<script type="text/javascript" src="js/dischargetest/4016.js"></script>
<script type="text/javascript" src="js/dischargetest/sysData.js"></script>
+ <script type="text/javascript" src="js/dischargetest/battData.js"></script>
<script type="text/javascript" src="pages/js/pages/control-common.js"></script>
<script type="text/javascript" src="pages/js/pages/siderbar.js"></script>
<script type="text/javascript" src="js/rightmenu.js"></script>
@@ -1260,6 +1338,7 @@
var equip4016_popup = new Popup($('#equip4016'));
var sysSet_popup = new Popup($('#sysSet_popup'));
var localNav = new Popup($('#localNav'));
+ var battInfo_popup = new Popup($('#battInfo_popup'));
// 鍏呮斁鐢靛脊鍑烘璁剧疆
$(function() {
// 鍒濆鍖朙D9鍏呮斁鐢靛脊鍑烘
@@ -1291,6 +1370,12 @@
$('#sysSet_popup').find('.close').bind('click', function() {
sysSet_popup.hidePopup(); // 闅愯棌sysSet_popup寮瑰嚭妗嗗拰閬僵灞�
});
+
+ // 璁剧疆鐢垫睜鍙傛暟
+ $('#battInfo_popup').find('.close').bind('click', function() {
+ battInfo_popup.hidePopup(); // 闅愯棌battInfo_popup寮瑰嚭妗嗗拰閬僵灞�
+ });
+
// bts闈㈡澘鍏呯數鐢垫祦缂栬緫
$('#ChargeCurrSetLabel .fa-edit').click(function() {
@@ -1364,6 +1449,7 @@
equip4016_popup.hidePopup(); // 闅愯棌4016寮瑰嚭妗嗗拰閬僵灞�
localNav.hidePopup();
sysSet_popup.hidePopup(); // 闅愯棌sysSet_popup寮瑰嚭妗嗗拰閬僵灞�
+ battInfo_popup.hidePopup(); // 闅愯棌battInfo_popup寮瑰嚭妗嗗拰閬僵灞�
});
});
//鍒濆鍖栨煴鐘跺浘
@@ -4983,17 +5069,19 @@
// 鐐瑰嚮璁惧杩涚▼鎸夐挳
$('#threadInfo').click(function() {
- console.log(threadInfoSearch);
+ // console.log(threadInfoSearch);
+ var batt = getBatt();
+ //console.log(batt);
+ threadInfoSearch.dev_id = batt.FBSDeviceId;
SendDeviceThreadInfo(threadInfoSearch,function(data){
- searchDeviceThreadInfo({dev_id:910000001});
+ searchDeviceThreadInfo({dev_id: threadInfoSearch.dev_id});
});
});
-
-
-
//缁橤PRS鍙戦�佹寚瀹氱殑鍛戒护锛岃幏鍙朅T杩斿洖鍊�
+ var threadInfoLoad;
function SendDeviceThreadInfo(param,callback){
+ threadInfoLoad = layer.load(1);
$.ajax({
type:"post",
url: "Bts_gprs_stateAction_action_update_bts_task_inf",
@@ -5027,16 +5115,21 @@
async:true,
dataType:'json',
data:'json='+JSON.stringify(param),
- success: function(data){
+ success: function(data){
+ layer.close(threadInfoLoad);
var model = eval('('+data.result+')');
- console.info(model);
- var btsTaskInf = model.data[0].bts_task_inf;
- layer.open({
- title: '璁惧杩涚▼',
- width: 380,
- height: 450,
- content: '<pre>'+btsTaskInf+'</pre>'
- });
+ if(model.code == 1) {
+ var btsTaskInf = model.data[0].bts_task_inf;
+ layer.open({
+ title: '璁惧杩涚▼',
+ width: 380,
+ height: 450,
+ content: '<pre>'+btsTaskInf+'</pre>'
+ });
+ }else {
+ layer.msg('鏌ヨ澶辫触');
+ }
+
if(callback && typeof callback == 'function'){
callback(model);
@@ -5054,6 +5147,82 @@
});
}
+
+ // 鐢垫睜鍙傛暟
+ var battCMD = GLOBAL.CMD.batt; // cmd鍛戒护
+ var battPopup = GLOBAL.battInfoPopup; // 鐢垫睜鍙傛暟妯″潡
+ battPopup.testVal(); // 璁剧疆闈㈡澘鐨勫彇鍊艰寖鍥�
+ $('#battInfoBtn').click(function() {
+ // 鑾峰彇鐢垫睜淇℃伅
+ var batt = getBatt();
+ var temp = {
+ dev_id: batt.FBSDeviceId
+ };
+
+ // 鏌ヨ鐢垫睜鍙傛暟闈㈡澘淇℃伅
+ var load = layer.load(1);
+ battPopup.search(temp, batt, function(res, binf) {
+ layer.close(load);
+ battInfo_popup.showPopup(); // 鏄剧ずbattInfo_popup寮瑰嚭妗嗗拰閬僵灞�
+ });
+
+ });
+
+ // 鐐瑰嚮璁惧畾
+ $('#battInfo_en').click(function() {
+ if($(this).hasClass('whyc-btn-disabled')) {
+ return;
+ }
+ // 璁剧疆鐢垫睜鍙傛暟闈㈡澘淇℃伅
+ var load = layer.load(1);
+ battPopup.set(function(res) {
+ layer.close(load);
+ layer.msg(res.msg);
+ });
+ });
+
+ // 鐐瑰嚮璇诲彇
+ $('#battInfo_read').click(function() {
+ var batt = getBatt();
+ var temp = {
+ dev_id: batt.FBSDeviceId
+ };
+ // 璁剧疆鐢垫睜鍙傛暟闈㈡澘淇℃伅
+ var load = layer.load(1);
+ battPopup.read(function(res) {
+ layer.close(load);
+ // console.log(res);
+ if(res.code == 1) {
+ battPopup.search(temp, batt, function(res, binf) {
+ layer.close(load);
+ layer.msg('鑾峰彇鍙傛暟鎴愬姛');
+ });
+ }else {
+ layer.msg('鑾峰彇鍙傛暟澶辫触');
+ }
+
+ });
+ });
+
+ // 鏌ヨ鐢垫睜鍙傛暟鐨勫��
+ function searchBattInfo(temp, binf) {
+ var load = layer.load(1);
+ // 鏌ヨ鐢垫睜鍙傛暟
+ $.ajax({
+ type: 'post'
+ ,async: true
+ ,url:'Fbs9100_battparamAction_action_serchByCondition'
+ ,data: 'json='+JSON.stringify(temp)
+ ,dataType: 'json'
+ ,success: function(res) {
+ var rs = JSON.parse(res.result);
+ //console.log(rs);
+ }
+ ,complete: function() {
+ layer.close(load);
+ }
+ });
+ }
});
// 鏈哄巻鍗℃ā鍧�
diff --git a/gx_tieta/WebRoot/index.jsp b/gx_tieta/WebRoot/index.jsp
index 351d3e4..9d0fc10 100644
--- a/gx_tieta/WebRoot/index.jsp
+++ b/gx_tieta/WebRoot/index.jsp
@@ -2543,7 +2543,7 @@
// 鏄剧ず鍖哄煙鐨勫浘鏍�
bmap.setDots(allStation);
bmap.queryInRect(map, createMapDot);
- updateStation(setRect);
+ updateStation();
// 鏇存柊灏忓伐鍏锋悳绱㈡満鎴垮姛鑳�
updateSearchSource(allStation);
@@ -3723,6 +3723,11 @@
type: 1
});
$(this).prop('checked', false);
+ }else if(num == 0) {
+ layerMsg = layer.msg("鑷冲皯閫夋嫨涓�涓紒", {
+ type: 1
+ });
+ $(this).prop('checked', true);
}
});
diff --git a/gx_tieta/WebRoot/js/base.js b/gx_tieta/WebRoot/js/base.js
index 7ff1c73..924f582 100644
--- a/gx_tieta/WebRoot/js/base.js
+++ b/gx_tieta/WebRoot/js/base.js
@@ -617,7 +617,7 @@
$.post("Battalarm_dataAction!serchRealTime",null,function(data){
model=eval("("+data.result+")");
if(model.code==1){
- $('#batt_alarm_num').text(model.sum);
+ $('#batt_alarm_num .num').text(model.sum);
if(totalAlm_num<model.sum){
createEleWarning(model.sum-totalAlm_num);
}
diff --git a/gx_tieta/WebRoot/js/dischargetest/battData.js b/gx_tieta/WebRoot/js/dischargetest/battData.js
new file mode 100644
index 0000000..3630984
--- /dev/null
+++ b/gx_tieta/WebRoot/js/dischargetest/battData.js
@@ -0,0 +1,297 @@
+// 璁剧疆鐢垫睜鍙傛暟
+;(function($, window, document, gl, undefined) {
+ // 璁剧疆battInfoPopup
+ gl.namespace('battInfoPopup');
+ // 妯″潡渚濊禆GLOBAL.CMD.batt妯″潡
+ var cmd = GLOBAL.CMD.batt;
+
+ // 鏁版嵁鏍￠獙
+ function testVal() {
+ // 鐢垫睜鏍囩О瀹归噺
+ $('#battInfo_nom_cap').testVal({
+ pattern: /^[0-9]{1,4}(\.[0-9]{0,1})?$/,
+ regVal: true,
+ min: 1,
+ max: 6000,
+ msg: '鍙栧�艰寖鍥�1~6000.0'
+ });
+
+ // 鐢垫睜鏍囩О鍐呴樆
+ $('#battInfo_nom_res').testVal({
+ pattern: /^[0-9]{1,4}$/,
+ regVal: true,
+ min: 1,
+ max: 60000,
+ msg: '鍙栧�艰寖鍥�1~60000'
+ });
+
+ // 鐢垫睜缁勬暟
+ $('#battInfo_batt_num').testVal({
+ pattern: /^[0-9]{1,4}$/,
+ regVal: true,
+ min: 1,
+ max: 2,
+ msg: '鍙栧�艰寖鍥�1~2'
+ });
+
+ // 姣忕粍鐢垫睜鍗曚綋鏁伴噺
+ $('#battInfo_batt_mon_num').testVal({
+ pattern: /^[0-9]{1,4}$/,
+ regVal: true,
+ min: 1,
+ max: 300,
+ msg: '鍙栧�艰寖鍥�1~300'
+ });
+
+ // 鍗曚綋鏍囩О鐢靛帇
+ $('#battInfo_batt_nom_vol').testVal({
+ pattern: /^[0-9]{1,4}(\.[0-9]{0,1})?$/,
+ regVal: true,
+ min: 0.1,
+ max: 20,
+ msg: '鍙栧�艰寖鍥�0.1~20.0'
+ });
+
+ // 鐢垫睜缁勭鏍囩О鐢靛帇
+ $('#battInfo_group_nom_vol').testVal({
+ pattern: /^[0-9]{1,4}(\.[0-9]{0,1})?$/,
+ regVal: true,
+ min: 0.1,
+ max: 600,
+ msg: '鍙栧�艰寖鍥�0.1~600.0'
+ });
+
+ // 鐢垫睜鏍囩О娓╁害
+ $('#battInfo_batt_nom_temp').testVal({
+ pattern: /^[0-9]{1,4}(\.[0-9]{0,1})?$/,
+ regVal: true,
+ min: 0.1,
+ max: 60,
+ msg: '鍙栧�艰寖鍥�0.1~60.0'
+ });
+
+ // 鐢垫睜娴厖鐢靛帇闃�鍊�
+ $('#battInfo_batt_float_vol').testVal({
+ pattern: /^[0-9]{1,4}(\.[0-9]{0,1})?$/,
+ regVal: true,
+ min: 0.1,
+ max: 60,
+ msg: '鍙栧�艰寖鍥�0.1~60.0'
+ });
+
+ // 鐢垫睜娴厖鐢垫祦闃�鍊�
+ $('#battInfo_batt_float_curr').testVal({
+ pattern: /^[0-9]{1,4}(\.[0-9]{0,1})?$/,
+ regVal: true,
+ min: 0.1,
+ max: 30,
+ msg: '鍙栧�艰寖鍥�0.1~30.0'
+ });
+
+ // 鍦ㄧ嚎鐢靛帇浣庨榾鍊�
+ $('#battInfo_online_low_vol').testVal({
+ pattern: /^[0-9]{1,4}(\.[0-9]{0,1})?$/,
+ regVal: true,
+ min: 0.1,
+ max: 60,
+ msg: '鍙栧�艰寖鍥�0.1~60.0'
+ });
+
+ // 鐢垫睜缁勮繛鎺ョ被鍨�
+ $('#battInfo_batt_link_type').testVal({
+ pattern: /^[0-9]{1,4}$/,
+ regVal: true,
+ min: 0,
+ max: 1,
+ msg: '鍙栧�艰寖鍥�0~1'
+ });
+
+ // 鍐呭鏀瑰彉璁剧疆鍊�
+ $('#battInfo_popup input[type=text]').on('input propertychange focus', function() {
+ setEnStatus();
+ });
+ }
+
+ // 灏唗estVal娣诲姞鍒癰attInfoPopup鍛藉悕绌洪棿涓�
+ gl.battInfoPopup.testVal = testVal;
+
+ // 鏌ヨ鏈烘埧鐨勪俊鎭�
+ function search(temp, binf, callback) {
+ // 鏌ヨ鐢垫睜鍙傛暟
+ $.ajax({
+ type: 'post'
+ ,async: true
+ ,url:'Fbs9100_battparamAction_action_serchByCondition'
+ ,data: 'json='+JSON.stringify(temp)
+ ,dataType: 'json'
+ ,success: function(res) {
+ var rs = JSON.parse(res.result);
+ init();
+ // 璁剧疆闈㈡澘淇℃伅
+ setParam(rs, binf);
+ if(isFunction(callback)) {
+ callback(rs, binf);
+ }
+ }
+ });
+ }
+
+ // 灏唖earch娣诲姞鍒癰attInfoPopup鍛藉悕绌洪棿涓�
+ gl.battInfoPopup.search = search;
+
+ // 璇诲彇淇℃伅
+ function read(callback) {
+ var param = {
+ dev_ip: $('#battInfo_ip').val() // 璁惧鐨刬p
+ ,dev_id: $('#battInfo_dev_id').val() // 璁惧鐨刬d
+ ,num: cmd.get // 鑾峰彇鐨勫懡浠�
+ ,STD_CAP: 0 // 鐢垫睜鏍囩О瀹归噺(AH)
+ ,STD_RES: 0 // 鐢垫睜鏍囩О鍐呴樆(u惟)
+ ,BattGroupCount: 0 // 鐢垫睜缁勬暟
+ ,EachGroupBattCount: 0 // 姣忕粍鐢垫睜鍗曚綋鏁伴噺
+ ,MonomerVol: 0 // 鍗曚綋鏍囩О鐢靛帇锛圴锛�
+ ,GroupVol: 0 // 鐢垫睜缁勭鏍囩О鐢靛帇锛圴锛�
+ ,BattTemp: 0 // 鐢垫睜鏍囩О娓╁害锛堚剝锛�
+ ,FloatChargeVol: 0 // 鐢垫睜娴厖鐢靛帇闃�鍊硷紙V锛�
+ ,FloatChargeCurr: 0 // 鐢垫睜娴厖鐢垫祦闃�鍊硷紙A锛�
+ ,OnlineVolLow: 0 // 鍦ㄧ嚎鐢靛帇浣庨榾鍊硷紙V锛�
+ ,GroupConnType: 0 // 鐢垫睜缁勮繛鎺ョ被鍨�
+ };
+ param.num = cmd.get;
+
+ // 璇诲彇鐢垫睜鍙傛暟
+ $.ajax({
+ type: 'post'
+ ,async: true
+ ,url:'Fbs9100_battparamAction_action_update'
+ ,data: 'json='+JSON.stringify(param)
+ ,dataType: 'json'
+ ,success: function(res) {
+ var rs = JSON.parse(res.result);
+ // 鏍规嵁璇诲彇鍒扮殑淇℃伅璁剧疆闈㈡澘鐨勪俊鎭�
+ // setParam(rs);
+
+ // 鍥炶皟鍐呭
+ if(isFunction(callback)) {
+ callback(rs);
+ }
+ }
+ });
+ }
+
+ // 灏唕ead娣诲姞鍒癰attInfoPopup鍛藉悕绌洪棿涓�
+ gl.battInfoPopup.read = read;
+
+ // 璁剧疆鏈烘埧鐢垫睜鐨勪俊鎭�
+ function set(callback) {
+ var param = getParam();
+ //console.log(param);
+ //return;
+ // 璁剧疆鐢垫睜鍙傛暟
+ $.ajax({
+ type: 'post'
+ ,async: true
+ ,url:'Fbs9100_battparamAction_action_update'
+ ,data: 'json='+JSON.stringify(param)
+ ,dataType: 'json'
+ ,success: function(res) {
+ var rs = JSON.parse(res.result);
+
+ // 鍥炶皟鍐呭
+ if(isFunction(callback)) {
+ callback(rs);
+ }
+ }
+ });
+ }
+
+ // 灏唖et娣诲姞鍒癰attInfoPopup鍛藉悕绌洪棿涓�
+ gl.battInfoPopup.set = set;
+
+ // 璁剧疆闈㈡澘鐨勬暟鎹�
+ function setParam(res, binf) {
+ if(binf) {
+ $('#battInfo_dev_id').val(binf.FBSDeviceId); // 璁惧鐨刬d
+ $('#battInfo_ip').val(binf.StationIp); // 璁惧鐨刬p
+ $('#battInfo_fbs_id').val(binf.FBSDeviceId); // 璁惧鐨刬d
+ $('#battInfo_home_name').val(binf.StationName); // 鏈烘埧鐨勫悕绉�
+ }
+ if(res.code == 0) {
+ $('#battInfo_nom_cap').val(1); // 鐢垫睜鏍囩О瀹归噺(AH)
+ $('#battInfo_nom_res').val(1); // 鐢垫睜鏍囩О鍐呴樆(u惟)
+ $('#battInfo_batt_num').val(1); // 鐢垫睜缁勬暟
+ $('#battInfo_batt_mon_num').val(1); // 姣忕粍鐢垫睜鍗曚綋鏁伴噺
+ $('#battInfo_batt_nom_vol').val(0); // 鍗曚綋鏍囩О鐢靛帇锛圴锛�
+ $('#battInfo_group_nom_vol').val(0);// 鐢垫睜缁勭鏍囩О鐢靛帇锛圴锛�
+ $('#battInfo_batt_nom_temp').val(0);// 鐢垫睜鏍囩О娓╁害锛堚剝锛�
+ $('#battInfo_batt_float_vol').val(0);// 鐢垫睜娴厖鐢靛帇闃�鍊硷紙V锛�
+ $('#battInfo_batt_float_curr').val(0);// 鐢垫睜娴厖鐢垫祦闃�鍊硷紙A锛�
+ $('#battInfo_online_low_vol').val(0); // 鍦ㄧ嚎鐢靛帇浣庨榾鍊硷紙V锛�
+ $('#battInfo_batt_link_type').val(1); // 鐢垫睜缁勮繛鎺ョ被鍨�
+ }else {
+ var data = res.data[0];
+ $('#battInfo_nom_cap').val(data.STD_CAP); // 鐢垫睜鏍囩О瀹归噺(AH)
+ $('#battInfo_nom_res').val(data.STD_RES); // 鐢垫睜鏍囩О鍐呴樆(u惟)
+ $('#battInfo_batt_num').val(data.BattGroupCount); // 鐢垫睜缁勬暟
+ $('#battInfo_batt_mon_num').val(data.EachGroupBattCount); // 姣忕粍鐢垫睜鍗曚綋鏁伴噺
+ $('#battInfo_batt_nom_vol').val(data.MonomerVol); // 鍗曚綋鏍囩О鐢靛帇锛圴锛�
+ $('#battInfo_group_nom_vol').val(data.GroupVol);// 鐢垫睜缁勭鏍囩О鐢靛帇锛圴锛�
+ $('#battInfo_batt_nom_temp').val(data.BattTemp);// 鐢垫睜鏍囩О娓╁害锛堚剝锛�
+ $('#battInfo_batt_float_vol').val(data.FloatChargeVol);// 鐢垫睜娴厖鐢靛帇闃�鍊硷紙V锛�
+ $('#battInfo_batt_float_curr').val(data.FloatChargeCurr);// 鐢垫睜娴厖鐢垫祦闃�鍊硷紙A锛�
+ $('#battInfo_online_low_vol').val(data.OnlineVolLow); // 鍦ㄧ嚎鐢靛帇浣庨榾鍊硷紙V锛�
+ $('#battInfo_batt_link_type').val(data.GroupConnType); // 鐢垫睜缁勮繛鎺ョ被鍨�
+
+ }
+
+
+ }
+
+ // 鑾峰彇闈㈡澘涓殑淇℃伅
+ function getParam() {
+ var rs = {};
+ rs.dev_ip = $('#battInfo_ip').val(); // 璁惧鐨刬p
+ rs.dev_id = $('#battInfo_dev_id').val(); // 璁惧鐨刬d
+ rs.num = cmd.set; // 璁剧疆鐨勫懡浠�
+ rs.STD_CAP = $('#battInfo_nom_cap').val(); // 鐢垫睜鏍囩О瀹归噺(AH)
+ rs.STD_RES = $('#battInfo_nom_res').val(); // 鐢垫睜鏍囩О鍐呴樆(u惟)
+ rs.BattGroupCount = $('#battInfo_batt_num').val(); // 鐢垫睜缁勬暟
+ rs.EachGroupBattCount = $('#battInfo_batt_mon_num').val(); // 姣忕粍鐢垫睜鍗曚綋鏁伴噺
+ rs.MonomerVol = $('#battInfo_batt_nom_vol').val(); // 鍗曚綋鏍囩О鐢靛帇锛圴锛�
+ rs.GroupVol = $('#battInfo_group_nom_vol').val(); // 鐢垫睜缁勭鏍囩О鐢靛帇锛圴锛�
+ rs.BattTemp = $('#battInfo_batt_nom_temp').val(); // 鐢垫睜鏍囩О娓╁害锛堚剝锛�
+ rs.FloatChargeVol = $('#battInfo_batt_float_vol').val(); // 鐢垫睜娴厖鐢靛帇闃�鍊硷紙V锛�
+ rs.FloatChargeCurr = $('#battInfo_batt_float_curr').val(); // 鐢垫睜娴厖鐢垫祦闃�鍊硷紙A锛�
+ rs.OnlineVolLow = $('#battInfo_online_low_vol').val(); // 鍦ㄧ嚎鐢靛帇浣庨榾鍊硷紙V锛�
+ rs.GroupConnType = $('#battInfo_batt_link_type').val(); // 鐢垫睜缁勮繛鎺ョ被鍨�
+ return rs;
+ }
+
+ // 鍒濆鍖栬〃鏍煎唴瀹�
+ function init(data) {
+ //console.log(battInfo_popup);
+ var _popup = battInfo_popup.popup;
+ _popup.find('input[type=text]').removeClass('error-data');
+ _popup.find('.status-change-set').removeClass('whyc-btn-disabled');
+ _popup.data = data;
+ }
+
+ // 璁剧疆闈㈡澘鐨勮缃寜閽殑鐘舵��
+ function setEnStatus() {
+ var _popup = battInfo_popup.popup;
+ var iptList = _popup.find('input[type=text]');
+ var setEn = _popup.find('.status-change-set');
+ var isError = false;
+ iptList.each(function() {
+ if($(this).hasClass('error-data')) {
+ isError = true;
+ }
+ });
+
+ if(isError) {
+ _popup.find('.status-change-set').addClass('whyc-btn-disabled');
+ }else {
+ _popup.find('.status-change-set').removeClass('whyc-btn-disabled');
+ }
+ }
+})(jQuery, window, document, GLOBAL);
\ No newline at end of file
diff --git a/gx_tieta/WebRoot/pages/js/common.js b/gx_tieta/WebRoot/pages/js/common.js
index d9071ea..6587c43 100644
--- a/gx_tieta/WebRoot/pages/js/common.js
+++ b/gx_tieta/WebRoot/pages/js/common.js
@@ -465,6 +465,11 @@
gl.CMD.gprs.param = 145;
gl.CMD.gprs.signal = "CSQ";
gl.CMD.gprs.threadinfo = 0x17;
+
+ // CMD涓媌att
+ gl.namespace('CMD.batt');
+ gl.CMD.batt.get = 0x36; // 鑾峰彇鐢垫睜鍙傛暟
+ gl.CMD.batt.set = 0x37; // 璁剧疆鐢垫睜鍙傛暟
})(jQuery, window, document, GLOBAL);
// 鍦板浘淇℃伅
diff --git a/gx_tieta/src/com/fgkj/actions/BattInfAction.java b/gx_tieta/src/com/fgkj/actions/BattInfAction.java
index 8520b5f..947b4f5 100644
--- a/gx_tieta/src/com/fgkj/actions/BattInfAction.java
+++ b/gx_tieta/src/com/fgkj/actions/BattInfAction.java
@@ -399,7 +399,20 @@
result = ActionUtil.tojson(model);
return SUCCESS;
}
-
+ //澶撮儴鏌ュ嚭宸插畨瑁呯殑鎵�鏈夋満鎴�
+ public String serchByDeviceId(){
+ User_inf uinf=(User_inf) getUser();
+ ServiceModel model = service.serchByDeviceId(uinf);
+ result = ActionUtil.tojson(model);
+ return SUCCESS;
+ }
+ //澶撮儴鏌ュ嚭宸插畨瑁呯殑鐢垫睜鍗曚綋
+ public String serchByInstall_count(){
+ User_inf uinf=(User_inf) getUser();
+ ServiceModel model = service.serchByInstall_count(uinf);
+ result = ActionUtil.tojson(model);
+ return SUCCESS;
+ }
public BattInf getBif() {
return bif;
}
diff --git a/gx_tieta/src/com/fgkj/actions/ram/Fbs9100_battparamAction.java b/gx_tieta/src/com/fgkj/actions/ram/Fbs9100_battparamAction.java
new file mode 100644
index 0000000..f0b43c8
--- /dev/null
+++ b/gx_tieta/src/com/fgkj/actions/ram/Fbs9100_battparamAction.java
@@ -0,0 +1,62 @@
+package com.fgkj.actions.ram;
+
+import java.util.List;
+
+import com.fgkj.actions.ActionUtil;
+import com.fgkj.dao.FBS9100_ComBase;
+import com.fgkj.dao.UinfDaoFactory;
+import com.fgkj.dto.ServiceModel;
+import com.fgkj.dto.User_log;
+import com.fgkj.dto.ram.Fbs9100_battparam;
+import com.fgkj.services.User_logService;
+import com.fgkj.services.ram.Fbs9100_battparamService;
+
+public class Fbs9100_battparamAction extends ActionUtil{
+ private Fbs9100_battparamService service=new Fbs9100_battparamService();
+ private User_logService uservice=new User_logService();
+ private String json;
+ private String result;
+
+ //鑾峰彇鐢垫睜鍙傛暟淇℃伅
+ public String update() {
+ Fbs9100_battparam bparam = getGson().fromJson(json, Fbs9100_battparam.class);
+ ServiceModel model = service.update(bparam);
+ { String msg="";
+ if(bparam.getNum()==FBS9100_ComBase.CMD_GetBattParam){
+ msg="鑾峰彇"+bparam.getDev_id()+"鐨勭數姹犲弬鏁颁俊鎭�";
+ }else if(bparam.getNum()==FBS9100_ComBase.CMD_SetBattParam){
+ msg="璁剧疆"+bparam.getDev_id()+"鐨勭數姹犲弬鏁颁俊鎭�";
+ }
+ User_log ulog=UinfDaoFactory.CreateULog(UinfDaoFactory.Alter, msg);
+ uservice.add(ulog);//灏嗙敤鎴风殑鎿嶄綔璁板綍涓嬫潵
+ }
+ result = tojson(model);
+ return SUCCESS;
+ }
+ //鏍规嵁璁惧id鏌ヨ鐢垫睜鍙傛暟淇℃伅
+ public String serchByCondition() {
+ Fbs9100_battparam bparam = getGson().fromJson(json, Fbs9100_battparam.class);
+ ServiceModel model = service.serchByCondition(bparam);
+ result = tojson(model);
+ return SUCCESS;
+ }
+
+
+
+
+
+
+
+
+
+
+ public String getResult() {
+ return result;
+ }
+ public void setJson(String json) {
+ this.json = json;
+ }
+
+
+
+}
diff --git a/gx_tieta/src/com/fgkj/dao/BaseDAO.java b/gx_tieta/src/com/fgkj/dao/BaseDAO.java
index 3b1c83f..a5b20ea 100644
--- a/gx_tieta/src/com/fgkj/dao/BaseDAO.java
+++ b/gx_tieta/src/com/fgkj/dao/BaseDAO.java
@@ -198,6 +198,8 @@
public static final int BTS_GPRS_STATE=97;
+ public static final int FBS9100_BATTPARAM=98;
+
public boolean add(Object obj); // 娣诲姞
public boolean update(Object obj); // 鏇存柊
diff --git a/gx_tieta/src/com/fgkj/dao/BaseDAOFactory.java b/gx_tieta/src/com/fgkj/dao/BaseDAOFactory.java
index 6cdd1ce..9fba458 100644
--- a/gx_tieta/src/com/fgkj/dao/BaseDAOFactory.java
+++ b/gx_tieta/src/com/fgkj/dao/BaseDAOFactory.java
@@ -83,6 +83,7 @@
import com.fgkj.dao.impl.bts61850.BTS_61850_stateImpl;
import com.fgkj.dao.impl.ram.Bts_gprs_stateImpl;
import com.fgkj.dao.impl.ram.Bts_station_stateImpl;
+import com.fgkj.dao.impl.ram.Fbs9100_battparamImpl;
import com.fgkj.dao.impl.ram.Fbs9100_setparamImpl;
import com.fgkj.dao.impl.ram.Fbs9100_stateImpl;
import com.fgkj.dao.impl.ram.Fbs9100_sysparamImpl;
@@ -204,6 +205,7 @@
case 95:return new StationtrafficImpl();
case 96:return new Fbs9100_sysparamImpl();
case 97:return new Bts_gprs_stateImpl();
+ case 98:return new Fbs9100_battparamImpl();
default :return null;
}
}
diff --git a/gx_tieta/src/com/fgkj/dao/FBS9100_ComBase.java b/gx_tieta/src/com/fgkj/dao/FBS9100_ComBase.java
index 24e4beb..8dad5d2 100644
--- a/gx_tieta/src/com/fgkj/dao/FBS9100_ComBase.java
+++ b/gx_tieta/src/com/fgkj/dao/FBS9100_ComBase.java
@@ -45,6 +45,12 @@
public static final int CMD_READGPRS_BTS_TASK_INF = 0x17;
public static final int CMD_READGPRS_BTS_TASK_INFACK = 0x16;
+ //璇诲彇鐢垫睜鍙傛暟
+ public static final int CMD_GetBattParam = 0x36; //鑾峰彇鐢垫睜鍙傛暟
+ public static final int CMD_SetBattParam = 0x37; //璁剧疆鐢垫睜鍙傛暟
+ public static final int CMD_GetBattParamACK = 0x38;
+ public static final int CMD_SetBattParamACK = 0x39;
+
//gprs閫氳鐨勫懡浠�
public static final String CSQ = "usr.cn#AT+";
diff --git a/gx_tieta/src/com/fgkj/dao/impl/BattInfImpl.java b/gx_tieta/src/com/fgkj/dao/impl/BattInfImpl.java
index dd8c1f2..4b6c4c8 100644
--- a/gx_tieta/src/com/fgkj/dao/impl/BattInfImpl.java
+++ b/gx_tieta/src/com/fgkj/dao/impl/BattInfImpl.java
@@ -1112,6 +1112,40 @@
}
return number;
}
+ //鏌ュ崟浣撴�绘暟(宸插畨瑁呯殑鍗曚綋)
+ public int serchByInstall_count(Object obj){
+ User_inf uinf=(User_inf) obj;
+ String sql=" SELECT sum(moncount) as nums 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 db_battinf.tb_battinf.station_install=1";
+ //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();
+ int nums=0;//鍗曚綋鎬绘暟
+ try {
+ while(rs.next()){
+ nums=rs.getInt("nums");
+ list.add(nums);
+ }
+ } catch (SQLException e) {
+ // TODO Auto-generated catch block
+ e.printStackTrace();
+ }
+ return list;
+ }
+
+ });
+ int number=0;//瀛樻斁鎬绘暟
+ if(list!=null&&list.size()>0){
+ number=(Integer) list.get(list.size()-1);
+ }
+ return number;
+ }
//鏌ヨ璁惧鎬绘暟(鍏ㄩ儴)
public List serchByDeviceId_all(Object obj){
User_inf uinf=(User_inf) obj;
@@ -4256,12 +4290,14 @@
//List<BattInf> list=biml.serchGroupByInfor(binf);
//List<BattInf> list=biml.searchInform1(bmd);
//<BattInf> list=biml.serchStationName5(binf);
- List<BattInf> list=biml.serchBattAllInfoByStationId(binf);
+ /*List<BattInf> list=biml.serchBattAllInfoByStationId(binf);
//List<BattInf> list=biml.searchInform_ky();
for (BattInf b : list) {
System.out.println(b);
}
- System.out.println(list.size());
+ System.out.println(list.size());*/
+ int nums=biml.serchByInstall_count(uinf);
+ System.out.println(nums);
}
public List getResults(ResultSet rs) {
diff --git a/gx_tieta/src/com/fgkj/dao/impl/Fbsdev_Statechange_infImpl.java b/gx_tieta/src/com/fgkj/dao/impl/Fbsdev_Statechange_infImpl.java
index 04cc247..f2c3ea2 100644
--- a/gx_tieta/src/com/fgkj/dao/impl/Fbsdev_Statechange_infImpl.java
+++ b/gx_tieta/src/com/fgkj/dao/impl/Fbsdev_Statechange_infImpl.java
@@ -48,7 +48,7 @@
String sql="";
String numberSql=" SELECT FOUND_ROWS() number";
Connection conn=DBUtil.getConn();
- String baseSql="select SQL_CALC_FOUND_ROWS distinct dev_id,rec_time,last_stat,now_stat,state_change_reason,dev_alarm,stationName " +
+ String baseSql="select SQL_CALC_FOUND_ROWS distinct dev_id,rec_time,last_stat,now_stat,eve_type,module_num,state_change_reason,dev_alarm,stationName " +
" from db_app_sys.tb_fbsdev_statechange_inf,db_battinf.tb_battinf " +
" where db_app_sys.tb_fbsdev_statechange_inf.dev_id=db_battinf.tb_battinf.fbsdeviceid " +
" and rec_time>? and rec_time<? ";
@@ -89,6 +89,8 @@
state_inf.setState_change_reason(rs.getInt("state_change_reason"));
state_inf.setState_change_reason_name(BattTestData.getStopType(BattTestData.TEST_LOADER_FBS9100S, rs.getInt("state_change_reason")));
state_inf.setDev_alarm(rs.getInt("dev_alarm"));
+ state_inf.setEve_type(rs.getInt("eve_type"));
+ state_inf.setModule_num(rs.getInt("module_num"));
state_inf.setNote(rs.getString("stationName"));
list.add(state_inf);
}
diff --git a/gx_tieta/src/com/fgkj/dao/impl/ram/Fbs9100_battparamImpl.java b/gx_tieta/src/com/fgkj/dao/impl/ram/Fbs9100_battparamImpl.java
index 9a86fc6..1b23589 100644
--- a/gx_tieta/src/com/fgkj/dao/impl/ram/Fbs9100_battparamImpl.java
+++ b/gx_tieta/src/com/fgkj/dao/impl/ram/Fbs9100_battparamImpl.java
@@ -1,5 +1,7 @@
package com.fgkj.dao.impl.ram;
+import java.sql.Connection;
+import java.sql.PreparedStatement;
import java.sql.ResultSet;
import java.sql.SQLException;
import java.util.ArrayList;
@@ -8,6 +10,7 @@
import com.fgkj.dao.BaseDAO;
import com.fgkj.dao.CallBack;
import com.fgkj.dao.DAOHelper;
+import com.fgkj.dao.FBS9100_ComBase;
import com.fgkj.db.DBUtil;
import com.fgkj.dto.ram.Fbs9100_battparam;
import com.mysql.fabric.xmlrpc.base.Array;
@@ -23,10 +26,15 @@
// TODO Auto-generated method stub
return false;
}
-
+ //淇敼鍙傛暟
public boolean update(Object obj) {
- // TODO Auto-generated method stub
- return false;
+ Fbs9100_battparam bparam=(Fbs9100_battparam) obj;
+ /*String sql=" update db_ram_db.tb_fbs9100_battparam set STD_CAP=?,STD_RES=?,BattGroupCount=?,EachGroupBattCount=?,MonomerVol=?,GroupVol=?,BattTemp=?,FloatChargeVol=?,FloatChargeCurr=?,OnlineVolLow=?,GroupConnType=? " +
+ " where dev_id=? ";*/
+ String sql=" replace into db_ram_db.tb_fbs9100_battparam(dev_id,dev_ip,STD_CAP,STD_RES,BattGroupCount,EachGroupBattCount,MonomerVol,GroupVol,BattTemp,FloatChargeVol,FloatChargeCurr,OnlineVolLow,GroupConnType) values(?,?,?,?,?,?,?,?,?,?,?,?,?)";
+ boolean bl=DAOHelper.executeUpdate(DBUtil.getConn(), sql, new Object[]{bparam.getDev_id(),bparam.getDev_ip(),bparam.getSTD_CAP(),bparam.getSTD_RES(),bparam.getBattGroupCount(),bparam.getEachGroupBattCount(),bparam.getMonomerVol(),bparam.getGroupVol()
+ ,bparam.getBattTemp(),bparam.getFloatChargeVol(),bparam.getFloatChargeCurr(),bparam.getOnlineVolLow(),bparam.getGroupConnType()});
+ return bl;
}
public boolean del(Object obj) {
@@ -41,7 +49,7 @@
//鏍规嵁璁惧id鏌ヨ鐢垫睜鍙傛暟淇℃伅
public List serchByCondition(Object obj) {
Fbs9100_battparam bparam=(Fbs9100_battparam) obj;
- String sql=" select distinct num,dev_ip,dev_id,op_cmd,STD_CAP,STD_RES,BattGroupCount,EachGroupBattCount,MonomerVol,GroupVol,BattTemp,FloatChargeVol,FloatChargeCurr,OnlineVolLow,GroupConnType " +
+ String sql=" select distinct dev_id, dev_ip,op_cmd,STD_CAP,STD_RES,BattGroupCount,EachGroupBattCount,MonomerVol,GroupVol,BattTemp,FloatChargeVol,FloatChargeCurr,OnlineVolLow,GroupConnType " +
" ,db_battinf.tb_battinf.DeviceName,StationName,StationName1,StationName2,StationName3,StationName5,StationId " +
" from db_ram_db.tb_fbs9100_battparam,db_battinf.tb_battinf " +
" where dev_id=? and db_ram_db.tb_fbs9100_battparam.dev_id=db_battinf.tb_battinf.fbsdeviceid" +
@@ -53,7 +61,6 @@
try {
while(rs.next()){
Fbs9100_battparam b=new Fbs9100_battparam();
- b.setNum(rs.getInt("num"));
b.setDev_ip(rs.getString("dev_ip"));
b.setDev_id(rs.getInt("dev_id"));
b.setOp_cmd(rs.getInt("op_cmd"));
@@ -63,18 +70,81 @@
b.setEachGroupBattCount(rs.getInt("eachGroupBattCount"));
b.setMonomerVol(rs.getFloat("monomerVol"));
b.setGroupVol(rs.getFloat("groupVol"));
+ b.setBattTemp(rs.getFloat("battTemp"));
+ b.setFloatChargeVol(rs.getFloat("floatChargeVol"));
+ b.setFloatChargeCurr(rs.getFloat("floatChargeCurr"));
+ b.setOnlineVolLow(rs.getFloat("onlineVolLow"));
+ b.setGroupConnType(rs.getInt("groupConnType"));
+ b.setDeviceName(rs.getString("deviceName"));
+ b.setStationName(rs.getString("stationName"));
+ b.setStationName1(rs.getString("stationName1"));
+ b.setStationName2(rs.getString("stationName2"));
+ b.setStationName3(rs.getString("stationName3"));
+ b.setStationName5(rs.getString("stationName5"));
+ b.setStationId(rs.getString("stationId"));
list.add(b);
}
} catch (SQLException e) {
// TODO Auto-generated catch block
e.printStackTrace();
}
- return null;
+ return list;
}
});
- return null;
+ return list;
}
-
+ //鐢垫睜鍙傛暟鍛戒护鎿嶄綔璁惧鏃剁殑cmd鍜宎ck鏍￠獙
+ public boolean sendCmdToBattparam(int cmd,int dev_id)
+ {
+ int m_cmd = cmd;
+ int m_cmd_ack = cmd;
+ switch(m_cmd) {
+ case FBS9100_ComBase.CMD_GetBattParam: m_cmd_ack = FBS9100_ComBase.CMD_GetBattParamACK; break;
+ case FBS9100_ComBase.CMD_SetBattParam: m_cmd_ack = FBS9100_ComBase.CMD_SetBattParamACK; break;
+ default: return false;
+ }
+ String sql_end = "";
+ boolean res_exe = false;
+ String sql = "UPDATE db_ram_db.tb_fbs9100_battparam SET "
+ + " op_cmd=? " + sql_end
+ + " WHERE dev_id=? ";
+ Boolean bl=DAOHelper.executeUpdate(DBUtil.getConn(), sql, new Object[]{m_cmd,dev_id});
+ if(true == bl)
+ {
+ sql = "SELECT op_cmd FROM db_ram_db.tb_fbs9100_battparam "+
+ " WHERE dev_id="+dev_id;
+ Connection conn=DBUtil.getConn();
+ PreparedStatement ps = null;
+ ResultSet rs = null;
+ for(int n=0; n<20; n++)
+ {
+ try {
+ ps = conn.prepareStatement(sql);
+ rs=ps.executeQuery();
+ if(rs.next())
+ {
+ if(rs.getInt("op_cmd") == m_cmd_ack)
+ {
+ res_exe = true;
+ break;
+ }
+ }
+ } catch (SQLException e) {
+ // TODO Auto-generated catch block
+ e.printStackTrace();
+ }
+
+ try {
+ Thread.sleep(250);
+ } catch (InterruptedException e) {
+ // TODO Auto-generated catch block
+ e.printStackTrace();
+ }
+ }
+ DBUtil.close(rs, ps, conn);
+ }
+ return res_exe;
+ }
public List serchByInfo(Object obj) {
// TODO Auto-generated method stub
return null;
diff --git a/gx_tieta/src/com/fgkj/dao/impl/ram/Fbs9100s_dfu_stateImpl.java b/gx_tieta/src/com/fgkj/dao/impl/ram/Fbs9100s_dfu_stateImpl.java
index a4e6832..d8d0327 100644
--- a/gx_tieta/src/com/fgkj/dao/impl/ram/Fbs9100s_dfu_stateImpl.java
+++ b/gx_tieta/src/com/fgkj/dao/impl/ram/Fbs9100s_dfu_stateImpl.java
@@ -24,15 +24,15 @@
//鍗囩骇鎻掑叆
public boolean add(Object obj) {
Fbs9100s_dfu_state dfu=(Fbs9100s_dfu_state) obj;
- String sql=" REPLACE into db_ram_db.tb_fbs9100s_dfu_state (dev_id,dfu_file,dfu_wr_stat,dfu_data_blocknum) values (?,?,?,?)";
- boolean bl=DAOHelper.executeUpdate(DBUtil.getConn(), sql, new Object[]{dfu.getDev_id(),dfu.getDfu_file(),dfu.getDfu_wr_stat(),dfu.getDfu_data_blocknum()});
+ String sql=" REPLACE into db_ram_db.tb_fbs9100s_dfu_state (dev_id,dfu_file,dfu_wr_stat,dfu_data_blocknum,dfu_file_len) values (?,?,?,?,?)";
+ boolean bl=DAOHelper.executeUpdate(DBUtil.getConn(), sql, new Object[]{dfu.getDev_id(),dfu.getDfu_file(),dfu.getDfu_wr_stat(),dfu.getDfu_data_blocknum(),dfu.getDfu_file_len()});
return bl;
}
- //鎵归噺鍗囩骇鎻掑叆(鎵�鏈夊睘鎬т紶鍒皊tationName涓�)
+ //鎵归噺鍗囩骇鎻掑叆(鎵�鏈夊睘鎬т紶鍒皊tationName涓�,鏂囦欢澶у皬鐨勫�兼斁鍦╪um涓�)
public boolean addPro(Object obj) {
BattInf binf=(BattInf) obj;
- String sql=" REPLACE into db_ram_db.tb_fbs9100s_dfu_state(dev_id,dfu_file,dfu_wr_stat,dfu_data_blocknum) " +
- " SELECT DISTINCT fBSDeviceId,'avr_dfu.uc3',1,1 FROM db_battinf.tb_battinf " +
+ String sql=" REPLACE into db_ram_db.tb_fbs9100s_dfu_state(dev_id,dfu_wr_stat,dfu_data_blocknum) " +
+ " SELECT DISTINCT fBSDeviceId,1,1 FROM db_battinf.tb_battinf " +
" where fBSDeviceId not in(select DISTINCT dev_id from db_ram_db.tb_fbs9100s_dfu_state where dfu_en=true) ";
//鏉′欢
String sql0=" and stationid=? "; //鍏蜂綋鏈烘埧
@@ -62,8 +62,12 @@
//琛ㄦ牸鏄剧ず鎵归噺鎻掑叆鐨勬満鎴夸俊鎭�
public List serchInserStation(Object obj){
BattInf binf=(BattInf) obj;
- String sql="SELECT DISTINCT fBSDeviceId,fBSDeviceName,stationId,stationname,stationname1,stationname2,stationname3,stationname5 from db_battinf.tb_battinf " +
- " where ";
+ String sql="SELECT DISTINCT fBSDeviceId,fBSDeviceName,stationId,stationname,stationname1,stationname2,stationname3,stationname5 " +
+ ",db_ram_db.tb_fbs9100_state.dev_id,db_ram_db.tb_fbs9100_state.dev_version" +
+ " from db_battinf.tb_battinf,db_ram_db.tb_fbs9100_state " +
+ " where db_battinf.tb_battinf.fBSDeviceId=db_ram_db.tb_fbs9100_state.dev_id " +
+ " and db_battinf.tb_battinf.station_install=1 " +
+ " and ";
//鏉′欢
String sql0=" stationid=? "; //鍏蜂綋鏈烘埧
String sql1=" stationname1=? ";//鐪�
@@ -102,6 +106,7 @@
binf.setStationName5(rs.getString("stationName5"));
binf.setStationId(rs.getString("stationId"));
binf.setFBSDeviceName(rs.getString("fBSDeviceName"));
+ binf.setStationIp(rs.getString("dev_version"));
list.add(binf);
}
} catch (SQLException e) {
@@ -170,7 +175,7 @@
if(list!=null&&list.size()>0){
for (int i = 0; i < list.size(); i++) {
Fbs9100s_dfu_state dfu=list.get(i);
- String sql="update db_ram_db.tb_fbs9100s_dfu_state set dfu_en=true,dfu_wr_stat=1, dfu_data_blocknum=1 where dev_id="+dfu.getDev_id();
+ String sql="update db_ram_db.tb_fbs9100s_dfu_state set dfu_en=true,dfu_wr_stat=1, dfu_data_blocknum=1,dfu_file="+dfu.getDfu_file()+" where dev_id="+dfu.getDev_id();
sql_str.add(sql);
{
String msg="鍗囩骇"+dfu.getDev_id()+"璁惧";
@@ -189,9 +194,13 @@
}
//鏌ヨ鍑烘墍鏈夊浜庡崌绾х殑璁惧
public List searchAll() {
- String sql=" select distinct dev_id,db_battinf.tb_battinf.stationname,db_battinf.tb_battinf.stationId,db_battinf.tb_battinf.fBSDeviceName,sysVersion_new,softVersion_new,sysVersion_dev,softVersion_dev,dfu_file,dfu_en,dfu_wr_stat,dfu_data_blocknum,dfu_data_blocklen " +
- " from db_ram_db.tb_fbs9100s_dfu_state,db_battinf.tb_battinf " +
- " where db_ram_db.tb_fbs9100s_dfu_state.dev_id=db_battinf.tb_battinf.fBSDeviceId and dfu_en=1";
+ String sql=" select distinct db_ram_db.tb_fbs9100s_dfu_state.dev_id,db_battinf.tb_battinf.stationname,db_battinf.tb_battinf.stationId,db_battinf.tb_battinf.fBSDeviceName " +
+ ",sysVersion_new,softVersion_new,sysVersion_dev,softVersion_dev,dfu_file,dfu_en,dfu_wr_stat,dfu_data_blocknum,dfu_data_blocklen,dfu_file_len " +
+ ",db_ram_db.tb_fbs9100_state.dev_version" +
+ " from db_ram_db.tb_fbs9100s_dfu_state,db_battinf.tb_battinf,db_ram_db.tb_fbs9100_state " +
+ " where db_ram_db.tb_fbs9100s_dfu_state.dev_id=db_battinf.tb_battinf.fBSDeviceId " +
+ " and db_ram_db.tb_fbs9100s_dfu_state.dev_id=db_ram_db.tb_fbs9100_state.dev_id " +
+ " and dfu_en=1";
List list=DAOHelper.executeQuery(sql, DBUtil.getConn(), null , new CallBack() {
public List getResults(ResultSet rs) {
@@ -208,10 +217,12 @@
dfu.setDfu_en(rs.getInt("dfu_en"));
dfu.setDfu_wr_stat(rs.getInt("dfu_wr_stat"));
dfu.setDfu_data_blocknum(rs.getInt("dfu_data_blocknum"));
+ dfu.setDfu_file_len(rs.getInt("dfu_file_len"));
dfu.setDfu_data_blocklen(rs.getInt("dfu_data_blocklen"));
dfu.setStationName(rs.getString("stationName"));
dfu.setStationId(rs.getString("stationId"));
dfu.setfBSDeviceName(rs.getString("fBSDeviceName"));
+ dfu.setNote(rs.getString("dev_version"));
list.add(dfu);
}
} catch (SQLException e) {
@@ -261,6 +272,7 @@
dfu.setDfu_en(rs.getInt("dfu_en"));
dfu.setDfu_wr_stat(rs.getInt("dfu_wr_stat"));
dfu.setDfu_data_blocknum(rs.getInt("dfu_data_blocknum"));
+ dfu.setDfu_file_len(rs.getInt("dfu_file_len"));
dfu.setDfu_data_blocklen(rs.getInt("dfu_data_blocklen"));
list.add(dfu);
}
@@ -275,7 +287,6 @@
}
public List serchByInfo(Object obj) {
- // TODO Auto-generated method stub
return null;
}
public static void main(String[] args) {
@@ -286,7 +297,7 @@
list.add(910000534);
BattInf binf=new BattInf();
binf.setNum(1);
- binf.setStationName("婀栧寳鐪�");
+ binf.setStationName("骞胯タ鐪�");
/*List<Fbs9100s_dfu_state> listAll=fimpl.serchByCondition(list);
for (Fbs9100s_dfu_state dfu : listAll) {
@@ -297,15 +308,21 @@
System.out.println(binf.getStationName3()+" "+binf.getFBSDeviceId());
}*/
- boolean bl=fimpl.addPro(binf);
- System.out.println(bl);
+ /*boolean bl=fimpl.addPro(binf);
+ System.out.println(bl);*/
/*List<BattInf> listAll=fimpl.serchInserStation(binf);
for (BattInf b : listAll) {
System.out.println(b.getStationName3()+" "+b.getFBSDeviceId());
- }*/
+ }
+ System.out.println(listAll.size());*/
/*List<Fbs9100s_dfu_state> listAll=fimpl.searchAll();
for (Fbs9100s_dfu_state dfu : listAll) {
System.out.println(dfu);
}*/
+ List<Fbs9100s_dfu_state> listAll=fimpl.searchAll();
+ for (Fbs9100s_dfu_state dfu : listAll) {
+ System.out.println(dfu);
+ }
+ System.out.println(listAll.size());
}
}
diff --git a/gx_tieta/src/com/fgkj/dto/Fbsdev_Statechange_inf.java b/gx_tieta/src/com/fgkj/dto/Fbsdev_Statechange_inf.java
index b56d698..de25425 100644
--- a/gx_tieta/src/com/fgkj/dto/Fbsdev_Statechange_inf.java
+++ b/gx_tieta/src/com/fgkj/dto/Fbsdev_Statechange_inf.java
@@ -16,6 +16,8 @@
private String state_change_reason_name;
private Integer dev_alarm;
private String dev_alarm_name;
+ private int eve_type;
+ private int module_num;
private String note;
private Page page;
@@ -136,17 +138,37 @@
this.page = page;
}
+ public int getEve_type() {
+ return eve_type;
+ }
+
+ public void setEve_type(int eve_type) {
+ this.eve_type = eve_type;
+ }
+
+ public int getModule_num() {
+ return module_num;
+ }
+
+ public void setModule_num(int module_num) {
+ this.module_num = module_num;
+ }
+
@Override
public String toString() {
return "Fbsdev_Statechange_inf [num=" + num + ", dev_id=" + dev_id
- + ", rec_time=" + rec_time + ", last_stat=" + last_stat
- + ", last_stat_name=" + last_stat_name + ", now_stat="
- + now_stat + ", now_stat_name=" + now_stat_name
- + ", state_change_reason=" + state_change_reason
- + ", state_change_reason_name=" + state_change_reason_name
- + ", dev_alarm=" + dev_alarm + ", dev_alarm_name="
- + dev_alarm_name + ", note=" + note + ", page=" + page + "]";
+ + ", rec_time=" + rec_time + ", rec_time1=" + rec_time1
+ + ", last_stat=" + last_stat + ", last_stat_name="
+ + last_stat_name + ", now_stat=" + now_stat
+ + ", now_stat_name=" + now_stat_name + ", state_change_reason="
+ + state_change_reason + ", state_change_reason_name="
+ + state_change_reason_name + ", dev_alarm=" + dev_alarm
+ + ", dev_alarm_name=" + dev_alarm_name + ", eve_type="
+ + eve_type + ", module_num=" + module_num + ", note=" + note
+ + ", page=" + page + "]";
}
+
+
}
diff --git a/gx_tieta/src/com/fgkj/dto/ram/Fbs9100s_dfu_state.java b/gx_tieta/src/com/fgkj/dto/ram/Fbs9100s_dfu_state.java
index 83b381f..8269888 100644
--- a/gx_tieta/src/com/fgkj/dto/ram/Fbs9100s_dfu_state.java
+++ b/gx_tieta/src/com/fgkj/dto/ram/Fbs9100s_dfu_state.java
@@ -13,12 +13,15 @@
private int dfu_en;
private int dfu_wr_stat;
private int dfu_data_blocknum;
+ private int dfu_file_len;
private int dfu_data_blocklen;
private String dfu_password;
private String stationName;
private String stationId;
private String fBSDeviceName;
+
+ private String note;
public int getNum() {
return num;
}
@@ -109,6 +112,18 @@
public void setfBSDeviceName(String fBSDeviceName) {
this.fBSDeviceName = fBSDeviceName;
}
+ public int getDfu_file_len() {
+ return dfu_file_len;
+ }
+ public void setDfu_file_len(int dfu_file_len) {
+ this.dfu_file_len = dfu_file_len;
+ }
+ public String getNote() {
+ return note;
+ }
+ public void setNote(String note) {
+ this.note = note;
+ }
@Override
public String toString() {
return "Fbs9100s_dfu_state [num=" + num + ", dev_id=" + dev_id
@@ -117,11 +132,12 @@
+ ", softVersion_dev=" + softVersion_dev + ", dfu_file="
+ dfu_file + ", dfu_en=" + dfu_en + ", dfu_wr_stat="
+ dfu_wr_stat + ", dfu_data_blocknum=" + dfu_data_blocknum
- + ", dfu_data_blocklen=" + dfu_data_blocklen
- + ", dfu_password=" + dfu_password + ", stationName="
- + stationName + ", stationId=" + stationId + ", fBSDeviceName="
- + fBSDeviceName + "]";
+ + ", dfu_file_len=" + dfu_file_len + ", dfu_data_blocklen="
+ + dfu_data_blocklen + ", dfu_password=" + dfu_password
+ + ", stationName=" + stationName + ", stationId=" + stationId
+ + ", fBSDeviceName=" + fBSDeviceName + ", note=" + note + "]";
}
+
}
diff --git a/gx_tieta/src/com/fgkj/services/BattInfServices.java b/gx_tieta/src/com/fgkj/services/BattInfServices.java
index 7f09cfc..72477ae 100644
--- a/gx_tieta/src/com/fgkj/services/BattInfServices.java
+++ b/gx_tieta/src/com/fgkj/services/BattInfServices.java
@@ -999,7 +999,22 @@
//System.out.println(model.getData());
return model;
}
-
+ //澶撮儴鏌ュ嚭宸插畨瑁呯殑鎵�鏈夋満鎴�
+ public ServiceModel serchByDeviceId(Object obj){
+ int devNum=(new BattInfImpl()).serchByDeviceId(obj); //鎬昏澶囨暟(宸插畨瑁�)
+ model.setCode(1);
+ model.setSum(devNum);
+ model.setMsg("鏌ヨ鎴愬姛!");
+ return model;
+ }
+ //澶撮儴鏌ュ嚭宸插畨瑁呯殑鐢垫睜鍗曚綋
+ public ServiceModel serchByInstall_count(Object obj){
+ int devNum=(new BattInfImpl()).serchByInstall_count(obj); //鎬昏澶囨暟(宸插畨瑁�)
+ model.setCode(1);
+ model.setSum(devNum);
+ model.setMsg("鏌ヨ鎴愬姛!");
+ return model;
+ }
public static void main(String[] args) {
//new BattInfServices().findMenu();
BattInf b=new BattInf();
diff --git a/gx_tieta/src/com/fgkj/services/ram/Fbs9100_battparamService.java b/gx_tieta/src/com/fgkj/services/ram/Fbs9100_battparamService.java
new file mode 100644
index 0000000..adae546
--- /dev/null
+++ b/gx_tieta/src/com/fgkj/services/ram/Fbs9100_battparamService.java
@@ -0,0 +1,56 @@
+package com.fgkj.services.ram;
+
+import java.util.List;
+
+import com.fgkj.dao.BaseDAO;
+import com.fgkj.dao.BaseDAOFactory;
+import com.fgkj.dao.FBS9100_ComBase;
+import com.fgkj.dao.impl.ram.Bts_gprs_stateImpl;
+import com.fgkj.dao.impl.ram.Fbs9100_battparamImpl;
+import com.fgkj.dto.ServiceModel;
+import com.fgkj.dto.ram.Bts_gprs_state;
+import com.fgkj.dto.ram.Fbs9100_battparam;
+
+public class Fbs9100_battparamService {
+ private BaseDAO dao;
+ private ServiceModel model;
+
+ public Fbs9100_battparamService() {
+ super();
+ dao=BaseDAOFactory.getBaseDAO(BaseDAO.FBS9100_BATTPARAM);
+ model=new ServiceModel();
+ }
+ //鑾峰彇鐢垫睜鍙傛暟淇℃伅
+ public ServiceModel update(Object obj) {
+ Fbs9100_battparam bparam=(Fbs9100_battparam) obj;
+ boolean b=dao.update(bparam);
+ if(b){
+ boolean bl=((Fbs9100_battparamImpl)dao).sendCmdToBattparam(bparam.getNum(), bparam.getDev_id());
+ if(bl){
+ model.setCode(1);
+ model.setMsg("淇敼鐢垫睜鍙傛暟鎴愬姛!");
+ }else{
+ model.setCode(0);
+ model.setMsg("淇敼鐢垫睜鍙傛暟澶辫触,璇锋鏌ョ綉缁�!");
+ }
+ }else{
+ model.setCode(0);
+ model.setMsg("淇敼鐢垫睜鍙傛暟澶辫触,璇锋鏌ョ綉缁�!");
+ }
+
+ return model;
+ }
+ //鏍规嵁璁惧id鏌ヨ鐢垫睜鍙傛暟淇℃伅
+ public ServiceModel serchByCondition(Object obj) {
+ List list=dao.serchByCondition(obj);
+ if(list!=null&&list.size()>0){
+ model.setCode(1);
+ model.setData(list);
+ model.setMsg("鏌ヨ鎴愬姛!");
+ }else{
+ model.setCode(0);
+ model.setMsg("鏌ヨ澶辫触!");
+ }
+ return model;
+ }
+}
--
Gitblit v1.9.1