From 400f7686beb33fbaa712260d8e79d29422b868e3 Mon Sep 17 00:00:00 2001
From: didiyu <1293722656@qq.com>
Date: 星期四, 29 十一月 2018 15:35:10 +0800
Subject: [PATCH] Merge branch 'dev_lxw' of https://didiyu@gitlab.com/whyclxw1/gx_tieta.git into dev_lxw
---
gx_tieta/WebRoot/css/basic-layout.css | 2
gx_tieta/src/com/fgkj/dto/Fbsdev_Statechange_inf.java | 16 ++
gx_tieta/WebRoot/batt-station-update1.jsp | 131 ++++++++++++------
gx_tieta/WebRoot/pages/js/pages/homeInfo.js | 2
gx_tieta/src/com/fgkj/dao/BattTestData.java | 46 +++++-
gx_tieta/src/com/fgkj/dao/impl/Fbsdev_Statechange_infImpl.java | 5
gx_tieta/WebRoot/batt-state-statistical.jsp | 6
gx_tieta/WebRoot/equip-stats-change.jsp | 197 ++++++++++++++++++++++++++-
8 files changed, 332 insertions(+), 73 deletions(-)
diff --git a/gx_tieta/WebRoot/batt-state-statistical.jsp b/gx_tieta/WebRoot/batt-state-statistical.jsp
index 6e01c08..883aacb 100644
--- a/gx_tieta/WebRoot/batt-state-statistical.jsp
+++ b/gx_tieta/WebRoot/batt-state-statistical.jsp
@@ -342,11 +342,9 @@
tmp.push(_data.station_event_type_tempup); // 娓╁害涓婇檺
tmp.push(_data.station_event_type_templow); // 娓╁害涓嬮檺
tmp.push(_data.station_event_type_dampup); // 婀垮害涓婇檺
- tmp.push(_data.station_event_type_damplow); // 婀垮害涓嬮檺
-
+ tmp.push(_data.station_event_type_damplow); // 婀垮害涓嬮檺
rs.push(tmp);
- }
-
+ }
return rs;
}
diff --git a/gx_tieta/WebRoot/batt-station-update1.jsp b/gx_tieta/WebRoot/batt-station-update1.jsp
index db93004..22d818d 100644
--- a/gx_tieta/WebRoot/batt-station-update1.jsp
+++ b/gx_tieta/WebRoot/batt-station-update1.jsp
@@ -380,10 +380,11 @@
,{field:'stationid', title:'鏈烘埧ID', align:'center'}
,{field:'stationname', title:'鏈烘埧鍚嶇О', align:'center', width: 400}
,{field:'fbsid', title:'璁惧ID', align:'center'}
- ,{field:'fbsname', title:'璁惧鍚嶇О', align:'center'}
,{field:'updatestatus', title:'鍗囩骇鐘舵��', align:'center'}
+ ,{field: 'version', title: '鐗堟湰鍙�', align: 'center'}
+ ,{field:'filename', title:'鍗囩骇鏂囦欢鍚�', align:'center'}
,{field:'status', title:'璇诲啓鐘舵��', align:'center'}
- ,{field:'progress', title:'涓婁紶杩涘害', align: 'center', templet:'#upProgress'}
+ ,{field:'progress', title:'璇�/鍐欒繘搴�', align: 'center', templet:'#upProgress'}
,{field:'datapackage', title:'褰撳墠鏁版嵁鍖�', align:'center'}
,{fixed: 'right', title:'鎿嶄綔', align:'center', toolbar: '#barDemo', width:100}
]]
@@ -495,17 +496,19 @@
var formaterData = formaterAddData(rs.data, allData); //瑙ｆ瀽鏁版嵁
if(formaterData.length) {
// 閬嶅巻formaterData
+ //console.log(formaterData);
for(var i=0; i<formaterData.length; i++) {
var _formaterData = formaterData[i];
var tmp = {};
tmp.stationid = _formaterData.StationId; // 鏈烘埧id
tmp.stationname = _formaterData.StationName; // 鏈烘埧鍚嶇О
tmp.fbsid = _formaterData.FBSDeviceId; // 璁惧id
- tmp.fbsname = _formaterData.FBSDeviceName; // 璁惧鍚嶇О
+ tmp.filename = getFnameByVer(_formaterData.StationIp); // 鍗囩骇鏂囦欢鍚嶇О
tmp.updatestatusnum = 0; // 0 绛夊緟鍗囩骇
tmp.updatestatus = '绛夊緟鍗囩骇'; // 鍗囩骇鐘舵��
tmp.status = '鍐�'; // 璇诲啓鐘舵��
tmp.datapackage = 1; // 褰撳墠鏁版嵁鍖�
+ tmp.version = _formaterData.StationIp; // 鐗堟湰鍙�
tmp.isNewAdd = true;
//console.log(tmp);
allData.push(tmp);
@@ -622,12 +625,16 @@
status: [],
datapackage: []
};
- //console.log(rs);
+ console.log(rs);
if(rs.code == 1 && rs.data.length>0){
var tblData = tOptions.data;
for(var i=0; i<rs.data.length; i++) {
var _data = rs.data[i];
var num = -1;
+ // 璁＄畻杩涘害
+ var currentPer = getStrPercent(_data.dfu_data_blocknum, _data.dfu_data_blocklen, _data.dfu_file_len, _data.dfu_wr_stat);
+ updateTblPorgress(_data.dev_id, currentPer);
+ //console.log(currentPer);
// 閬嶅巻鐜版湁鐨則blData/鏍规嵁琛ㄦ牸鐨勮鍒玦d瀵硅幏鍙栧埌鍊艰繘琛屾帓搴忎互渚垮搴旇〃鏍煎唴瀹�
for(var k=0; k<tblData.length;k++) {
var _tblData = tblData[k];
@@ -696,7 +703,7 @@
}
- //楠岃瘉璁惧鏄惁鍏佽璁惧杩涜杩滅▼鍗囩骇
+ // 楠岃瘉璁惧鏄惁鍏佽璁惧杩涜杩滅▼鍗囩骇
function checkStationState(temp, all){
$.ajax({
type: "post",
@@ -710,12 +717,12 @@
if(rs.code == 1) {
var data = rs.data;
var updateData = checkUpdating(data, all);
- var errorUpdate = checkErrorUpdate(data, all);
- $('#updateIframeData').data('update', updateData); // 鍙洿鏂扮殑璁惧淇℃伅
- $('#updateIframeData').data('errorUpdate', errorUpdate); // 鏃犳硶鏇存柊鐨勮澶囦俊鎭�
+ $('#updateIframeData').data('update', updateData.good); // 鍙洿鏂扮殑璁惧淇℃伅
+ $('#updateIframeData').data('errorUpdate', updateData.bad); // 鏃犳硶鏇存柊鐨勮澶囦俊鎭�
+ console.log(updateData);
// 鍒ゆ柇鏄惁鏈夊崌绾х殑璁惧
- if(updateData.length == 0) {
+ if(updateData.good.length == 0) {
if(temp.length == 1) {
layer.msg('褰撳墠璁惧鏃犳硶鍗囩骇锛�');
}else {
@@ -735,18 +742,24 @@
content: 'iframe/batt-station-update.html',
btn: ['纭鍗囩骇', '鍙栨秷'],
yes: function(index, layero) {
- var updateData = $('#updateIframeData').data('update'); // 鑾峰彇鍙崌绾ц澶囩殑淇℃伅
+ var goodUpdateData = $('#updateIframeData').data('update'); // 鑾峰彇鍙崌绾ц澶囩殑淇℃伅
// 鏍规嵁鍙崌绾ц澶囩殑淇℃伅鏋勯�犳煡璇㈡潯浠�
var updateList = [];
- for(var i=0; i<updateData.length; i++) {
+ for(var i=0; i<goodUpdateData.length; i++) {
+ var _data = goodUpdateData[i];
+ //var filename = getFnameByVer(_data.version);
var _tmp = {
- dev_id: updateData[i].fbsid
+ dev_id: _data.fbsid
+ ,dfu_file: _data.filename
};
-
+ console.log(_data);
// 娣诲姞鍒拌澶囧崌绾у垪琛ㄤ腑
- updateList.push(_tmp);
+ if(_data.filename && _data.filename.length != 0) {
+ updateList.push(_tmp);
+ }
+
}
-
+ //console.log(updateList);
// 鍏抽棴寮瑰嚭闈㈡澘
layer.close(index);
@@ -771,34 +784,12 @@
}
- // 浠庤繑鍥炵殑鍙崌绾х殑璁惧涓墧闄ゆ鍦ㄥ崌绾х殑璁惧
+ // 鏍煎紡璇濆崌绾х殑璁惧
function checkUpdating(rsData, all) {
- var rs = [];
- // 閬嶅巻all
- for(var i=0; i<all.length; i++) {
- var _all = all[i];
- var isError = true;
- for(var k=0; k<rsData.length; k++) {
- var _rsData = rsData[k];
-
- // 鍒ゆ柇褰撳墠璁惧鏄惁姝ｅ湪鍗囩骇
- if(_all.updatestatusnum == 1) {
- isError = false;
- }
- }
-
- // 鏍规嵁isError鍒よ鏄惁鏄笉鍙坊鍔犵殑鏈烘埧
- if(isError) {
- rs.push(_all);
- }
- }
-
- return rs;
- }
-
- // 鑾峰彇鏃犳硶鍗囩骇鐨勮澶�
- function checkErrorUpdate(rsData, all) {
- var rs = [];
+ var rs = {
+ good: []
+ ,bad: []
+ };
// 閬嶅巻all
for(var i=0; i<all.length; i++) {
var _all = all[i];
@@ -816,7 +807,9 @@
// 鏍规嵁isError鍒よ鏄惁鏄笉鍙坊鍔犵殑鏈烘埧
if(isError) {
- rs.push(_all);
+ rs.bad.push(_all);
+ }else {
+ rs.good.push(_all);
}
}
@@ -868,6 +861,8 @@
tmp.fbsid = _data.dev_id; // 璁惧id
tmp.fbsname = _data.fBSDeviceName; // 璁惧鍚嶇О
tmp.updatestatusnum = 1; // 0 绛夊緟鍗囩骇 1姝ｅ湪鍗囩骇
+ tmp.version = _data.note; // 鐗堟湰鍙�
+ tmp.filename = _data.dfu_file; // 鍗囩骇鏂囦欢鍚嶇О
tmp.updatestatus = '鍗囩骇涓�'; // 鍗囩骇鐘舵��
tmp.status = _data.dfu_wr_stat == 1?'鍐�':_data.dfu_wr_stat == 2?'璇�':_data.dfu_wr_stat == 3?'瀹屾垚':''; // 璇诲啓鐘舵��
tmp.datapackage = _data.dfu_data_blocknum; // 褰撳墠鏁版嵁鍖�
@@ -878,11 +873,11 @@
// 鏇存柊琛ㄦ牸
table.render(tOptions);
+ renderTblPorgess(allData);
}
}
});
}
-
// 娓叉煋杩涘害鏉�
function renderTblPorgess(tblData) {
@@ -895,6 +890,54 @@
}
}
+
+ // 鏇存柊杩涘害鏉�
+ function updateTblPorgress(fbsid, percent) {
+
+ // 鏇存柊杩涘害鏉�
+ element.progress('upload'+fbsid, percent);
+ }
+
+ // 璁＄畻杩涘害
+ function getStrPercent(current, blocklen, all, status) {
+ var rs = '0%';
+ if(all != 0) {
+ var num = Math.ceil(current*blocklen*100/all);
+ if(num>=100) {
+ num = status == 1?'鍐欏畬鎴�':'鍗囩骇瀹屾垚';
+
+ }
+
+ rs = num+'%';
+ }
+
+ return rs;
+ }
+ //console.log(getFnameByVer('D:8,V2.53.40'));
+ // 鏇村叿鐗堟湰鍙疯幏鍙栨枃浠剁殑鍚嶇О
+ function getFnameByVer(version) {
+ var fileList = [
+ {
+ filename: 'avr_dfu.uc3'
+ ,pattern: /^.*\.24\.[0-9]*$/
+ }
+ ,{
+ filename: 'E51_DFU.SM5'
+ ,pattern: /^.*\.53\.[0-9]*$/
+ }
+ ];
+
+ // 閬嶅巻骞惰幏鍙杅ilename
+ var filename = undefined;
+ for(var i=0; i<fileList.length; i++) {
+ var _fileList = fileList[i];
+ if(_fileList.pattern.test(version)) {
+ filename = _fileList.filename;
+ }
+ }
+
+ return filename;
+ }
});
</script>
</body>
diff --git a/gx_tieta/WebRoot/css/basic-layout.css b/gx_tieta/WebRoot/css/basic-layout.css
index 28f6982..f9facd3 100644
--- a/gx_tieta/WebRoot/css/basic-layout.css
+++ b/gx_tieta/WebRoot/css/basic-layout.css
@@ -39,7 +39,7 @@
}
.page-content .content-item.side-bar-container {
- width: 240px;
+ width: 360px;
background-color: #fff;
}
.page-content .content-item.data-show {
diff --git a/gx_tieta/WebRoot/equip-stats-change.jsp b/gx_tieta/WebRoot/equip-stats-change.jsp
index a3dfc79..0b352e0 100644
--- a/gx_tieta/WebRoot/equip-stats-change.jsp
+++ b/gx_tieta/WebRoot/equip-stats-change.jsp
@@ -16,11 +16,12 @@
<link rel="stylesheet" type="text/css" href="css/loading.css">
<link rel="stylesheet" type="text/css" href="css/basic-layout.css"/>
<link rel="stylesheet" href="css/common.css">
+ <link rel="stylesheet" type="text/css" href="css/popup-tbl.css">
<link rel="stylesheet" href="src/css/layui.css">
<style>
#lside {
position: absolute;
- top: 0;
+ top: 30px;
left: 0;
bottom: 0;
right: 0;
@@ -36,6 +37,13 @@
<jsp:include page="nav.jsp" flush="true"/>
<div class="page-content">
<div class="content-item side-bar-container">
+ <div class="siderbar-tools">
+ <div class="siderbar-tools-right">
+ <i class="fa fa-file-text-o" title="鏈哄巻鍗�" id="siderbarToolsCard"></i>
+ <i class="fa fa-search" title="鏌ヨ鏈烘埧" id="siderbarToolsSearch"></i>
+ <i class="fa fa-outdent" title="鍏ㄩ儴鏀剁缉" id="siderbarToolsHide"></i>
+ </div>
+ </div>
<div class="lside" id="lside"></div>
</div>
<div class="content-item data-show">
@@ -109,12 +117,43 @@
</div>
</div>
</div>
+ <div class="popup"></div>
+ <!-- 瀵艰埅瀹氫綅 -->
+ <div class="popup w500 mr250" id="localNav">
+ <div class="popup-title"><span>鏈烘埧鏌ヨ</span><a href="javascript:;" class="close">X</a></div>
+ <div class="popup-content">
+ <div class="popup-tbl">
+ <table>
+ <tbody>
+ <tr>
+ <th>鏈烘埧鍚嶇О/鏈烘埧id</th>
+ </tr>
+ <tr>
+ <td>
+ <input name="popupHomeName" id="popupHomeName" type="text">
+ </td>
+ </tr>
+ </tbody>
+ </table>
+ </div>
+ </div>
+
+ <div class="popup-footer">
+ <input type="button" name="" id="localNav_en" class="status-change-btn" value="纭畾" > <!-- 纭畾 -->
+ <input type="button" name="" class="close" value="鍙栨秷" > <!-- 鍙栨秷 -->
+ </div>
+ </div>
+
+ <!-- iframe鏁版嵁涓存椂瀛樺偍浣嶇疆 -->
+ <div id="homeInfoIframeData"></div>
+ <script type="text/javascript" src="src/layui.all.js"></script>
<script type="text/javascript" src="jqueryui/jquery-ui.min.js"></script>
<script type="text/javascript" src="js/equip-stats-change.jquery.ui.js"></script>
<script type="text/javascript" src="js/basic-layout.js"></script>
<script type="text/javascript" src="pages/js/pages/siderbar.js"></script>
<script type="text/javascript" src="js/pageUtil.js"></script>
- <script type="text/javascript" src="src/layui.all.js"></script>
+ <script type="text/javascript" src="js/popup.js"></script>
+ <script type="text/javascript" src="pages/js/pages/homeInfo.js"></script>
<script type="text/javascript">
var arrTh = [];
var arrTd = [];
@@ -125,9 +164,20 @@
};
var layerMsg;
+ var localNav = new Popup($('#localNav'));
+ // 鍒濆鍖杔ocalNav寮瑰嚭妗�
+ $('#localNav').find('.close').bind('click', function() {
+ localNav.hidePopup(); // 闅愯棌localNav寮瑰嚭妗嗗拰閬僵灞�
+ });
+
+ // 绐楀彛澶у皬鏀瑰彉
+ $(window).resize(function() {
+ localNav.hidePopup();
+ });
+
// 鐢熸垚椤甸潰涓殑琛ㄦ牸
$(function () {
- arrTh = ['璁惧Id', '鏈烘埧鍚嶇О', '鍙樿縼鍓嶇姸鎬�', '鍙樿縼鍚庣姸鎬�', '鍙樿縼鍘熷洜', '鍙樿縼鏃堕棿'];
+ arrTh = ['璁惧Id', '鏈烘埧鍚嶇О', '浜嬩欢绫诲瀷', '鍙樿縼鍓嶇姸鎬�', '鍙樿縼鍚庣姸鎬�', '鍙樿縼鍘熷洜','妯″潡缂栧彿','鍙樿縼鏃堕棿'];
createFullTbl($('.tbl-header'), $('.tbl-body'), arrTh, arrTd);
var stop_types = [
'鎵嬪姩鍋滄', '鏆傚仠', '姝ｅ湪鏀剧數娴嬭瘯', '姝ｅ湪绛夊緟鏀剧數', '姝ｅ湪闄愭祦鏀剧數',
@@ -183,15 +233,18 @@
success: function(data){
data = eval('('+data+')');
var model = eval('('+data.result+')');
- //console.info(model);
+ console.info(model);
if(model.code == 1){
- for(var i=0;i<model.data.length;i++){
- arrTd.push(model.data[i].dev_id); //璁惧id
- arrTd.push(model.data[i].note); //鏈烘埧鍚嶇О
- arrTd.push(model.data[i].last_stat_name); //鍙樻崲鍓嶇姸鎬�
- arrTd.push(model.data[i].now_stat_name); //鍙樺寲鍚庣姸鎬�
- arrTd.push(model.data[i].state_change_reason_name); //鍙樻崲鍘熷洜
- arrTd.push(model.data[i].rec_time); //鍙樻崲鏃堕棿
+ for(var i=0;i<model.data.length;i++){
+ var _data = model.data[i];
+ arrTd.push(_data.dev_id); //璁惧id
+ arrTd.push(_data.note); //鏈烘埧鍚嶇О
+ arrTd.push(_data.eve_type_name); //鍙樿縼鍓嶄簨浠剁被鍨�
+ arrTd.push(_data.last_stat_name); //鍙樻崲鍓嶇姸鎬�
+ arrTd.push(_data.now_stat_name); //鍙樺寲鍚庣姸鎬�
+ arrTd.push(_data.state_change_reason_name); //鍙樻崲鍘熷洜
+ arrTd.push(_data.module_num); //妯″潡缂栧彿
+ arrTd.push(_data.rec_time); //鍙樻崲鏃堕棿
if(model.data[i].page != undefined){
Page.pageAll = model.data[i].page.pageAll; //鎬昏褰曟潯鏁�
@@ -209,6 +262,28 @@
createFullTbl($('.tbl-header'), $('.tbl-body'), arrTh, arrTd);
}
});
+ }
+
+ // 浜嬩欢绫诲瀷
+ function getTextByVal(num) {
+ var _num = Number(num);
+ var rs = '';
+ switch(_num){
+ case 0:
+ rs = 'BTS宸ヤ綔鐘舵�侊細';
+ break;
+ case 11:
+ rs = 'SD鍗℃晠闅滐細';
+ break;
+ case 12:
+ rs = '鐢垫睜绂荤嚎鐘舵�侊細';
+ break;
+ case 20:
+ rs = 'DCDC妯″潡鍛婅鐘舵�侊細';
+ break;
+ }
+
+ return rs;
}
/**
@@ -318,6 +393,7 @@
var third = GLOBAL.pages.siderbar.third; // 涓夌骇瀵艰埅
var fourth = GLOBAL.pages.siderbar.fourth; // 鍥涚骇瀵艰埅
var fifth = GLOBAL.pages.siderbar.fifth; // 浜旂骇瀵艰埅
+ var localSideBar = GLOBAL.pages.siderbar.localSideBar; // 瀹氫綅鏈烘埧
var treeView = new TreeView($('#lside'));
$('#lside').width($('#ele_content').width());
treeView.setContainer();
@@ -372,10 +448,107 @@
// 鐢垫睜缁�
treeView.ele.on('click', '.eleGroup', function() {
var eleGroup = $(this).data('attr');
-
searchDevHistoryRecord();
});
+
+ // 宸ュ叿鏉�-鍏ㄩ儴鏀剁缉
+ $('#siderbarToolsHide').click(function(){
+ treeView.ele.find('li').removeClass('sider-menu-open');
+ });
+
+ // 宸ュ叿鏉�-鏈哄巻鍗�
+ $('#siderbarToolsCard').click(function(){
+ var batt = getBatt();
+ var tmp = {
+ province: batt.StationName1,
+ city: batt.StationName2,
+ county: batt.StationName5,
+ home: batt.StationName,
+ homeid: batt.StationId,
+ battid: batt.BattGroupId
+ };
+ // 鏄剧ず鍩虹珯鏈哄巻鍗�
+ showHomeInfo(batt.StationId);
+ // 鏍规嵁鏁版嵁瀹氫綅
+ localSideBar(treeView, treeView.container, tmp);
+ });
+
+ // 宸ュ叿鏉�-鏌ヨ
+ $('#siderbarToolsSearch').click(function(){
+ localNav.homeInfo = undefined;
+ $('#popupHomeName').val('');
+ localNav.showPopup();
+ });
+
+ // 鐐瑰嚮闈㈡澘鐨勭‘瀹氭寜閽�
+ $('#localNav_en').click(function() {
+ // 瀹氫綅
+ if(localNav.homeInfo) {
+ localNav.hidePopup();
+ localSideBar(treeView, treeView.container, localNav.homeInfo);
+ }else {
+
+ }
+ });
+
+ // 鏌ヨ鏈烘埧骞舵洿鏂皊ource
+ var homeSource = [];
+ findHome();
+
+ // 瀹氫箟鏈烘埧鏌ヨ淇℃伅
+ $( "#popupHomeName" ).autocomplete({
+ source: homeSource,
+ select: function(event, ui) {
+ localNav.homeInfo = ui.item; // 璁剧疆鏈烘埧淇℃伅鍐呭
+ }
+ });
+
+ // 鏌ヨ鏈烘埧
+ function findHome() {
+ var tmp = {
+ StationName1:'',
+ StationName2: '',
+ StationName5:''
+ };
+
+ // 鏌ヨ灏嗕俊鎭�
+ $.post("BattInfAction!serchStationName3","json="+JSON.stringify(tmp),function(result){
+ var rs = JSON.parse(result.result);
+ if(rs.code==1){
+ homeSource = [];
+ var data = rs.data;
+ for(var i=0; i<data.length; i++) {
+ var _data = data[i];
+ var tmp = {
+ label: _data.StationName+'('+_data.StationId+')',
+ province: _data.StationName1,
+ city: _data.StationName2,
+ county: _data.StationName5,
+ home: _data.StationName,
+ homeid: _data.StationId,
+ battid: undefined
+ };
+
+ // 娣诲姞鍒拌祫婧�
+ homeSource.push(tmp);
+ }
+ $( "#popupHomeName" ).autocomplete('option', 'source', homeSource);
+ }
+ });
+ }
+
});
+
+ //鏍规嵁褰撳墠閫変腑鐨勭數姹犵粍id鑾峰彇褰撳墠鐢垫睜缁勭殑淇℃伅
+ function getBatt(){
+ var activeFile = $('.whyc-sider-menu .sider-menu-file.active');
+ if(activeFile.length == 1) {
+ return activeFile.data('attr');
+ }else {
+ return undefined;
+ }
+
+ }
</script>
</body>
</html>
diff --git a/gx_tieta/WebRoot/pages/js/pages/homeInfo.js b/gx_tieta/WebRoot/pages/js/pages/homeInfo.js
index 80450e9..d262d4d 100644
--- a/gx_tieta/WebRoot/pages/js/pages/homeInfo.js
+++ b/gx_tieta/WebRoot/pages/js/pages/homeInfo.js
@@ -15,7 +15,7 @@
var rs = JSON.parse(result.result);
if(rs.code == 1) {
var data = rs.data;
- //console.log(data);
+ console.log(data);
var rsData = formatHomeInfo(data);
$('#homeInfoIframeData').data('data', rsData);
// 鏄剧ず闈㈡澘
diff --git a/gx_tieta/src/com/fgkj/dao/BattTestData.java b/gx_tieta/src/com/fgkj/dao/BattTestData.java
index 15c5437..fbafbec 100644
--- a/gx_tieta/src/com/fgkj/dao/BattTestData.java
+++ b/gx_tieta/src/com/fgkj/dao/BattTestData.java
@@ -261,13 +261,45 @@
return stop_type;
}
//璁惧鐘舵�佸彉鎹㈠搴斿叧绯�
- public static String getFbsdev_Statechange(int state){
- String state_name="鍋滄";
- switch(state){
- case 0:state_name="鍋滄";break;
- case 1:state_name="鏀剧數";break;
- case 2:state_name="鍏呯數";break;
- }
+ public static String getFbsdev_Statechange(int eve_type,int state){
+ String state_name="鏈煡";
+ if(eve_type==0){
+ if(state==0){
+ state_name="鍦ㄧ嚎鐩戞祴";
+ }else if(state==1){
+ state_name="鏀剧數娴嬭瘯";
+ }else if(state==2){
+ state_name="鍏呯數娴嬭瘯";
+ }else if(state==3){
+ state_name="鍗囧帇缁埅";
+ }
+ }else if(eve_type==11){
+ if(state==0){
+ state_name="姝ｅ父";
+ }else if(state==1){
+ state_name="鏁呴殰";
+ }
+ }else if(eve_type==12){
+ if(state==0){
+ state_name="鍦ㄧ嚎";
+ }else if(state==1){
+ state_name="绂荤嚎";
+ }
+ }else if(eve_type==20){
+ state_name="0x"+Integer.toHexString(state);
+ }
return state_name;
}
+
+ //璁惧鐘舵�佸彉鎹㈠搴攅ve_type
+ public static String getEve_type_name(int eve_type){
+ String eve_type_name="鏈煡";
+ switch(eve_type){
+ case 0:eve_type_name="BTS宸ヤ綔鐘舵��";break;
+ case 11:eve_type_name="SD鍗℃晠闅�";break;
+ case 12:eve_type_name="鐢垫睜绂荤嚎鐘舵��";break;
+ case 20:eve_type_name="DCDC妯″潡鍛婅鐘舵��";break;
+ }
+ return eve_type_name;
+ }
}
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 f2c3ea2..bf8a5b3 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
@@ -83,13 +83,14 @@
state_inf.setDev_id(rs.getInt("dev_id"));
state_inf.setRec_time(rs.getTimestamp("rec_time"));
state_inf.setLast_stat(rs.getInt("last_stat"));
- state_inf.setLast_stat_name(BattTestData.getFbsdev_Statechange(rs.getInt("last_stat")));
+ state_inf.setLast_stat_name(BattTestData.getFbsdev_Statechange(rs.getInt("eve_type"),rs.getInt("last_stat")));
state_inf.setNow_stat(rs.getInt("now_stat"));
- state_inf.setNow_stat_name(BattTestData.getFbsdev_Statechange(rs.getInt("now_stat")));
+ state_inf.setNow_stat_name(BattTestData.getFbsdev_Statechange(rs.getInt("eve_type"),rs.getInt("now_stat")));
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.setEve_type_name(BattTestData.getEve_type_name(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/dto/Fbsdev_Statechange_inf.java b/gx_tieta/src/com/fgkj/dto/Fbsdev_Statechange_inf.java
index de25425..550671e 100644
--- a/gx_tieta/src/com/fgkj/dto/Fbsdev_Statechange_inf.java
+++ b/gx_tieta/src/com/fgkj/dto/Fbsdev_Statechange_inf.java
@@ -17,6 +17,7 @@
private Integer dev_alarm;
private String dev_alarm_name;
private int eve_type;
+ private String eve_type_name;
private int module_num;
private String note;
private Page page;
@@ -153,6 +154,14 @@
public void setModule_num(int module_num) {
this.module_num = module_num;
}
+
+ public String getEve_type_name() {
+ return eve_type_name;
+ }
+
+ public void setEve_type_name(String eve_type_name) {
+ this.eve_type_name = eve_type_name;
+ }
@Override
public String toString() {
@@ -164,11 +173,14 @@
+ 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 + "]";
+ + eve_type + ", eve_type_name=" + eve_type_name
+ + ", module_num=" + module_num + ", note=" + note + ", page="
+ + page + "]";
}
+
+
}
--
Gitblit v1.9.1