From 6382c2a4220ff5774dba39848c2faabf0f7002f1 Mon Sep 17 00:00:00 2001
From: didiyu <1293722656@qq.com>
Date: 星期一, 10 十二月 2018 10:39:42 +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/BattinfGroupFactory.java | 29 ++++
gx_tieta/src/com/fgkj/dao/impl/Database_backupImpl.java | 32 ++++
gx_tieta/WebRoot/control.jsp | 4
gx_tieta/WebRoot/js/dischargetest/sysData.js | 8
gx_tieta/WebRoot/ele-param1.jsp | 88 +++++++++++-
gx_tieta/WebRoot/eleHistoryWarn.jsp | 13 -
gx_tieta/src/com/fgkj/dao/impl/Battalarm_data_historyImpl.java | 3
gx_tieta/WebRoot/iframe/batt-info-edit.html | 138 ++++++++++++++-----
gx_tieta/src/com/fgkj/dao/impl/BattInfImpl.java | 43 +++--
gx_tieta/src/com/fgkj/dao/impl/BadBatt_monImpl.java | 4
gx_tieta/WebRoot/css/common.css | 6
gx_tieta/WebRoot/iframe/batt-info-add.html | 19 ++
12 files changed, 304 insertions(+), 83 deletions(-)
diff --git a/gx_tieta/WebRoot/control.jsp b/gx_tieta/WebRoot/control.jsp
index cc6607f..8ff0c27 100644
--- a/gx_tieta/WebRoot/control.jsp
+++ b/gx_tieta/WebRoot/control.jsp
@@ -1026,7 +1026,7 @@
</tr>
<tr>
<th>鍗曚綋鏁版嵁鏉ユ簮绫诲瀷</th>
- <th>鍋滅數鍗囧帇姒ㄥ共鐢垫睜鏁伴噺锛�1~2锛�</th>
+ <th>鍋滅數鍗囧帇姒ㄥ共鐢垫睜鏁伴噺锛�0~2锛�</th>
</tr>
<tr>
<td>
@@ -1046,7 +1046,7 @@
<td><input type="text" id="sysSet_startLimit" value=""></td>
</tr>
<tr>
- <th>鐢垫睜鍚堣矾鍣ㄤ富鐢垫睜缁勭紪鍙凤紙1~2锛�</th>
+ <th>鐢垫睜鍚堣矾鍣ㄤ富鐢垫睜缁勭紪鍙凤紙0~2锛�</th>
<th>鑳屽厜鏃堕暱锛�0~999鍒嗛挓锛�</th>
</tr>
<tr>
diff --git a/gx_tieta/WebRoot/css/common.css b/gx_tieta/WebRoot/css/common.css
index 29a0338..5d8eb9a 100644
--- a/gx_tieta/WebRoot/css/common.css
+++ b/gx_tieta/WebRoot/css/common.css
@@ -226,6 +226,12 @@
padding: 4px 0 4px 8px;
}
+body .ui-autocomplete {
+ height: 200px;
+ overflow-y: auto;
+ overflow-x: hidden;
+}
+
/* jquery ui style */
body .ui-front {
z-index: 999999;
diff --git a/gx_tieta/WebRoot/ele-param1.jsp b/gx_tieta/WebRoot/ele-param1.jsp
index 9437d58..e23abfc 100644
--- a/gx_tieta/WebRoot/ele-param1.jsp
+++ b/gx_tieta/WebRoot/ele-param1.jsp
@@ -483,14 +483,80 @@
// 缂栬緫鐢垫睜缁勪俊鎭�
function editBattGroup(obj) {
- $('#iframeEdit').data('data', obj.data);
- iframePopup = layer.open({
- type: 2
- ,area:['1200px', '520px']
- ,resize: false
- ,content: 'iframe/batt-info-edit.html'
- });
+ //console.log(obj);
+ searchHomeInfoByName(obj.data.StationName);
}
+
+ // 鏍规嵁鏈烘埧鐨勫悕绉版煡璇㈡満鎴跨殑淇℃伅
+ function searchHomeInfoByName(homename) {
+ var temp = {
+ binf:{
+ StationName1: '', // 鐪�
+ StationName2: '', // 甯�
+ StationName5: '', // 鍖�/鍘�
+ StationName: homename // 鏈烘埧鍚嶇О
+ }
+ ,page: {
+ pageCurr: 1
+ ,pageSize: 100
+ }
+ };
+
+ var load = layer.load(1);
+ // 璇锋眰鍚庡彴
+ $.ajax({
+ type: "post",
+ url: "BattInfAction!searchInform",
+ async:true,
+ dataType:'json',
+ data:"json="+JSON.stringify(temp),
+
+ success: function(res){
+ var rs = JSON.parse(res.result)
+ if(rs.code == 1) {
+ var data = rs.data;
+ var tmp = {
+ btsinfo:[]
+ };
+ // 閬嶅巻鏌ヨ缁撴灉
+ for(var i=0; i<data.length; i++) {
+ var _data = data[i];
+ // 閬嶅巻缁撴灉闆嗙敓鎴愮壒娈婄殑鏍煎紡鏁版嵁
+ var _tmp = {};
+ Object.keys(_data).forEach(function(key) {
+ if(key == 'GroupIndexInFBSDevice') { // 璁惧绱㈠紩
+ _tmp.GroupIndexInFBSDevice = _data.GroupIndexInFBSDevice;
+ }else if(key == 'BattGroupName') { // 鐢垫睜缁勫悕绉�
+ _tmp.BattGroupName = _data.BattGroupName;
+ }else if(key == 'BattGroupId') { // 鐢垫睜缁処D
+ _tmp.BattGroupId = _data.BattGroupId;
+ }else {
+ tmp[key] = _data[key];
+ }
+ });
+
+ tmp.btsinfo.push(_tmp);
+ }
+
+ //console.log(tmp);
+ $('#iframeEdit').data('data', tmp);
+ iframePopup = layer.open({
+ type: 2
+ ,title: '淇敼鐢垫睜缁�'
+ ,area:['1200px', '520px']
+ ,resize: false
+ ,content: 'iframe/batt-info-edit.html'
+ });
+ }else {
+ layer.msg('鑾峰彇鏁版嵁澶辫触锛�')
+ }
+ },
+ complete: function() {
+ layer.close(load);
+ }
+ });
+ }
+
// 鍒犻櫎鐢垫睜缁�
function delBattGroup(obj) {
@@ -510,12 +576,12 @@
var bts = data.StationName4; // 璁惧鍚嶇О
data.StationName = province+'-'+city+'-'+home+'-'+bts;
var temp = [data];
- delBatt(temp);
+ delBatt(temp, obj);
});
}
//鍒犻櫎澶氫釜鐢垫睜缁�
- function delBatt(temp){
+ function delBatt(temp, obj){
var load = layer.load(1);
$.ajax({
type: "post",
@@ -529,7 +595,8 @@
//console.info(model);
if(model.code ==1){
layer.msg('鍒犻櫎鎴愬姛锛�');
- $('#paging .search').click();
+ obj.del();
+ //$('#paging .search').click();
}else{
layer.msg('鍒犻櫎澶辫触锛�');
}
@@ -609,6 +676,7 @@
iframePopup = layer.open({
type: 2
+ ,title: '鏂板缓鐢垫睜缁�'
,area:['1200px', '520px']
,resize: false
,content: 'iframe/batt-info-add.html'
diff --git a/gx_tieta/WebRoot/eleHistoryWarn.jsp b/gx_tieta/WebRoot/eleHistoryWarn.jsp
index 1b16135..a6e81a4 100644
--- a/gx_tieta/WebRoot/eleHistoryWarn.jsp
+++ b/gx_tieta/WebRoot/eleHistoryWarn.jsp
@@ -303,14 +303,6 @@
}
- $(function(){
- //鐐瑰嚮鏌ヨ鎸夐挳
- $('#paging .search').click(function(){
- searchHistalm();
- });
- });
-
-
var formjson;
//鏌ヨ鍘嗗彶鍛婅璁板綍
function searchHistalm(){
@@ -320,7 +312,7 @@
$.post("Battalarm_data_historyAction!serchByInfo","json="+json,function(data){
data=data.result;
data=eval("("+data+")");
- console.info(data);
+ //console.info(data);
if(data.code==1 && data.data.length>0){
data=data.data;
ArrWarnTb = new Array(); // 鐢ㄤ簬瀛樻斁琛ㄦ牸鏁版嵁
@@ -403,7 +395,7 @@
master_audit:$('#master_audit').is(':checked')?$('#master_audit').attr('class'):0, //涓夌骇鍛婅
num:$('#num').is(':checked')?$('#num').attr('class'):0, //涓�绾у憡璀�
BattGroupId:$('#BattGroupId').is(':checked')?$('#BattGroupId').attr('class'):0, //浜岀骇鍛婅
- usr_id:$('#usr_id').val(), //鍦ㄧ嚎鐢靛帇 119001
+ usr_id:$('#usr_id').is(':checked')?$('#usr_id').attr('class'):0, //鍦ㄧ嚎鐢靛帇 119001
fault_type_id:$('#fault_type_id').is(':checked')?$('#fault_type_id').attr('class'):0, //缁勭鐢靛帇 119002
fault_level:$('#fault_level').is(':checked')?$('#fault_level').attr('class'):0, //鍏呯數鐢垫祦 119003
record_uid:$('#record_uid').is(':checked')?$('#record_uid').attr('class'):0, //鏀剧數鐢垫祦 119004
@@ -422,6 +414,7 @@
Record_Id:$('#Record_Id').val() //瀹归噺鏇存崲鍛婅
}
};
+ //console.info(temp);
return temp;
}
diff --git a/gx_tieta/WebRoot/iframe/batt-info-add.html b/gx_tieta/WebRoot/iframe/batt-info-add.html
index e671491..2ff4046 100644
--- a/gx_tieta/WebRoot/iframe/batt-info-add.html
+++ b/gx_tieta/WebRoot/iframe/batt-info-add.html
@@ -240,7 +240,7 @@
<div class="layui-block">
<label class="layui-form-label">鍩虹珯鎵嬫満鍙风爜<span class="red">*</span></label>
<div class="layui-input-block">
- <input type="text" name="station_phone" lay-verify="required|phone" id="stationphone" autocomplete="off" class="layui-input" value="{{= d.station_phone }}">
+ <input type="text" name="station_phone" lay-verify="required|number" id="stationphone" autocomplete="off" class="layui-input" value="{{= d.station_phone }}">
</div>
</div>
</div>
@@ -441,6 +441,23 @@
$('#fbsip').val(getDevIp(val));
});
+ // 鏍规嵁鏍囩О鐢靛帇淇敼璁剧疆娴厖鐢靛帇闃�鍊�/璁剧疆绂荤嚎鐢靛帇闃�鍊�
+ $('#battInfo').on('input propertychange', '#monvol', setFloatAndoutLine);
+
+ // 鏍规嵁鍗曚綋鏁伴噺淇敼璁剧疆娴厖鐢靛帇闃�鍊�/璁剧疆绂荤嚎鐢靛帇闃�鍊�
+ $('#battInfo').on('input propertychange', '#moncount', setFloatAndoutLine);
+
+ // 璁剧疆娴厖鐢靛帇闃�鍊�/璁剧疆绂荤嚎鐢靛帇闃�鍊�
+ function setFloatAndoutLine() {
+ var vol = $('#monvol').val();
+ var monnum = $('#moncount').val();
+ var chargeVol = (vol*1.117*monnum).toFixed(1); // 娴厖鐢靛帇闃�鍊�
+ var outlineVol = (vol*1.073*monnum).toFixed(1); // 绂荤嚎鐢靛帇闃�鍊�
+
+ $('#floatVolLevel').val(chargeVol); // 娴厖鐢靛帇闃�鍊�
+ $('#offlineVolLevel').val(outlineVol); // 绂荤嚎鐢靛帇闃�鍊�
+ }
+
// 鎻愪氦鍐呭
form.on('submit(enAdd)', function(data) {
// console.log(data);
diff --git a/gx_tieta/WebRoot/iframe/batt-info-edit.html b/gx_tieta/WebRoot/iframe/batt-info-edit.html
index af9caf7..b570de3 100644
--- a/gx_tieta/WebRoot/iframe/batt-info-edit.html
+++ b/gx_tieta/WebRoot/iframe/batt-info-edit.html
@@ -134,41 +134,9 @@
</div>
<div class="layui-col-xs6 layui-col-sm6 layui-col-md4 layui-col-lg3">
<div class="layui-block">
- <label class="layui-form-label">璁惧绱㈠紩<span class="red">*</span></label>
- <div class="layui-input-block">
- <select name="GroupIndexInFBSDevice" id="devindex">
- {{# layui.each([0,1,2,3], function(index) { }};
- {{# if(index == d.GroupIndexInFBSDevice) { }}
- <option value="{{ index }}" selected>{{ index }}</option>
- {{# }else{ }}
- <option value="{{ index }}">{{ index }}</option>
- {{# } }}
- {{# }); }}
- </select>
- </div>
- </div>
- </div>
- <div class="layui-col-xs6 layui-col-sm6 layui-col-md4 layui-col-lg3">
- <div class="layui-block">
- <label class="layui-form-label">鐢垫睜缁処D</label>
- <div class="layui-input-block">
- <input type="text" name="BattGroupId" lay-verify="required|number" id="groupid" disabled="" autocomplete="off" class="layui-input layui-bg-gray" value="{{= d.BattGroupId }}">
- </div>
- </div>
- </div>
- <div class="layui-col-xs6 layui-col-sm6 layui-col-md4 layui-col-lg3">
- <div class="layui-block">
<label class="layui-form-label">鐢垫睜缁勭紪鍙�</label>
<div class="layui-input-block">
<input type="text" name="BattGroupNum" lay-verify="required|number" id="groupnum" disabled="" autocomplete="off" class="layui-input layui-bg-gray" value="{{= d.BattGroupNum }}">
- </div>
- </div>
- </div>
- <div class="layui-col-xs6 layui-col-sm6 layui-col-md4 layui-col-lg3">
- <div class="layui-block">
- <label class="layui-form-label">鐢垫睜缁勫悕绉�</label>
- <div class="layui-input-block">
- <input type="text" name="BattGroupName" lay-verify="required" id="groupname" autocomplete="off" class="layui-input" value="{{= d.BattGroupName }}">
</div>
</div>
</div>
@@ -264,7 +232,7 @@
<div class="layui-block">
<label class="layui-form-label">鍩虹珯鎵嬫満鍙风爜<span class="red">*</span></label>
<div class="layui-input-block">
- <input type="text" name="station_phone" lay-verify="required|phone" id="stationphone" autocomplete="off" class="layui-input" value="{{= d.station_phone }}">
+ <input type="text" name="station_phone" lay-verify="required|number" id="stationphone" autocomplete="off" class="layui-input" value="{{= d.station_phone }}">
</div>
</div>
</div>
@@ -333,6 +301,51 @@
</div>
</div>
</div>
+ <div class="layui-row layui-col-space8">
+ {{# layui.each(d.btsinfo, function(index, item) { }}
+ <div class="layui-col-lg6">
+ <div class="layui-card">
+ <div class="layui-card-header layui-bg-gray">{{item.BattGroupName}}</div>
+ <div class="layui-card-body">
+ <div class="layui-row layui-col-space8">
+ <div class="layui-col-lg6">
+ <div class="layui-block">
+ <label class="layui-form-label">璁惧绱㈠紩<span class="red">*</span></label>
+ <div class="layui-input-block">
+ <select name="group{{item.GroupIndexInFBSDevice}}.index">
+ {{# layui.each([0,1,2,3], function(k) { }}
+ {{# if(item.GroupIndexInFBSDevice == k) { }}
+ <option value="{{ k }}" selected>{{ k }}</option>
+ {{# }else{ }}
+ <option value="{{ k }}">{{ k }}</option>
+ {{# } }}
+ {{# }); }}
+ </select>
+ </div>
+ </div>
+ </div>
+ <div class="layui-col-lg6">
+ <div class="layui-block">
+ <label class="layui-form-label">鐢垫睜缁処D</label>
+ <div class="layui-input-block">
+ <input type="text" name="group{{item.GroupIndexInFBSDevice}}.id" lay-verify="required" disabled="" autocomplete="off" class="layui-input layui-bg-gray" value="{{item.BattGroupId}}">
+ </div>
+ </div>
+ </div>
+ <div class="layui-col-lg6">
+ <div class="layui-block">
+ <label class="layui-form-label">鐢垫睜缁勫悕绉�</label>
+ <div class="layui-input-block">
+ <input type="text" name="group{{item.GroupIndexInFBSDevice}}.name" lay-verify="required" autocomplete="off" class="layui-input" value="{{item.BattGroupName}}">
+ </div>
+ </div>
+ </div>
+ </div>
+ </div>
+ </div>
+ </div>
+ {{# }); }}
+ </div>
</script>
<script type="text/javascript" src="../src/layui.js"></script>
<script type="text/javascript">
@@ -428,6 +441,23 @@
$('#fbsip').val(getDevIp(val));
});
+ // 鏍规嵁鏍囩О鐢靛帇淇敼璁剧疆娴厖鐢靛帇闃�鍊�/璁剧疆绂荤嚎鐢靛帇闃�鍊�
+ $('#battInfo').on('input propertychange', '#monvol', setFloatAndoutLine);
+
+ // 鏍规嵁鍗曚綋鏁伴噺淇敼璁剧疆娴厖鐢靛帇闃�鍊�/璁剧疆绂荤嚎鐢靛帇闃�鍊�
+ $('#battInfo').on('input propertychange', '#moncount', setFloatAndoutLine);
+
+ // 璁剧疆娴厖鐢靛帇闃�鍊�/璁剧疆绂荤嚎鐢靛帇闃�鍊�
+ function setFloatAndoutLine() {
+ var vol = $('#monvol').val();
+ var monnum = $('#moncount').val();
+ var chargeVol = (vol*1.117*monnum).toFixed(1); // 娴厖鐢靛帇闃�鍊�
+ var outlineVol = (vol*1.073*monnum).toFixed(1); // 绂荤嚎鐢靛帇闃�鍊�
+
+ $('#floatVolLevel').val(chargeVol); // 娴厖鐢靛帇闃�鍊�
+ $('#offlineVolLevel').val(outlineVol); // 绂荤嚎鐢靛帇闃�鍊�
+ }
+
// 鎻愪氦鍐呭
form.on('submit(enEidt)', function(data) {
layer.confirm('鏄惁纭淇敼', {icon: 3, title:'鎻愮ず'}, function(index){
@@ -437,8 +467,8 @@
var home = _data.StationName3; // 鏈烘埧鍚嶇О
var bts = _data.StationName4; // 璁惧鍚嶇О
_data.StationName = province+'-'+city+'-'+home+'-'+bts;
- var temp = [_data];
- //console.log(temp);
+ var temp = analysisData(editInfo.btsinfo, _data);
+ // console.log(temp);
// 鏇存柊鏁版嵁
updBatt(temp);
});
@@ -502,6 +532,44 @@
}
});
}
+
+ // 瑙ｆ瀽娣诲姞鐨勬暟鎹�
+ function analysisData(btsinfo, data) {
+ //console.log(arr);
+ var rs = [];
+ for(var i=0; i<btsinfo.length; i++) {
+ var temp = {};
+ var _btsinfo = btsinfo[i];
+ var _num = _btsinfo.GroupIndexInFBSDevice;
+ var _index = 'group'+_num+'.index';
+ var _name = 'group'+_num+'.name';
+ var _id = 'group'+_num+'.id';
+ Object.keys(data).forEach(function(key) {
+ if(checkKeyNotVal(key)) {
+ if(key == _index) {
+ temp.GroupIndexInFBSDevice = data[key];
+ }else if(key == _name){
+ temp.BattGroupName = data[key];
+ }else if(key == _id) {
+ temp.BattGroupId = data[key];
+ }
+ }else {
+ temp[key] = data[key];
+ }
+ });
+
+ rs.push(temp);
+ }
+
+ return rs;
+ }
+
+ // 妫�娴嬪綋鍓嶅睘鎬ф槸鍚︿负搴熷睘鎬�
+ function checkKeyNotVal(key) {
+ var patt = /^group[0-9]{1}\./;
+
+ return patt.test(key);
+ }
});
</script>
</body>
diff --git a/gx_tieta/WebRoot/js/dischargetest/sysData.js b/gx_tieta/WebRoot/js/dischargetest/sysData.js
index caa164e..22f58fc 100644
--- a/gx_tieta/WebRoot/js/dischargetest/sysData.js
+++ b/gx_tieta/WebRoot/js/dischargetest/sysData.js
@@ -86,9 +86,9 @@
$('#sysSet_groupNum').testVal({
pattern: /^[0-9]{1,4}$/,
regVal: true,
- min: 1,
+ min: 0,
max: 2,
- msg: '鍙栧�艰寖鍥�1~2锛堟暣鏁帮級'
+ msg: '鍙栧�艰寖鍥�0~2锛堟暣鏁帮級'
});
// 鑳屽厜鏃堕暱锛�0~999鍒嗛挓锛�
@@ -113,9 +113,9 @@
$('#sysSet_bleedNum').testVal({
pattern: /^[0-9]{1,4}$/,
regVal: true,
- min: 1,
+ min: 0,
max: 2,
- msg: '鍙栧�艰寖鍥�1~2锛堟暣鏁帮級'
+ msg: '鍙栧�艰寖鍥�0~2锛堟暣鏁帮級'
});
diff --git a/gx_tieta/src/com/fgkj/dao/BattinfGroupFactory.java b/gx_tieta/src/com/fgkj/dao/BattinfGroupFactory.java
index 2259cf5..5024dc6 100644
--- a/gx_tieta/src/com/fgkj/dao/BattinfGroupFactory.java
+++ b/gx_tieta/src/com/fgkj/dao/BattinfGroupFactory.java
@@ -5,7 +5,9 @@
import com.fgkj.dao.impl.BattInfImpl;
import com.fgkj.dao.impl.Batt_rtstateDAOImpl;
+import com.fgkj.dao.impl.Database_backupImpl;
import com.fgkj.dto.BattInf;
+import com.fgkj.dto.Database_backup;
public class BattinfGroupFactory {
//灏嗗悓涓�stationame涓殑2v,6v,12v鏁版嵁鏁村悎
@@ -116,4 +118,31 @@
int station_next=station_max+1;
return station_next;
}
+
+ //褰撳battinf琛ㄤ腑鏁版嵁杩涜澧炲垹鏀圭殑鎿嶄綔鏃讹紝鍏堝浠絛b_battinf.tb_battinf
+ public static boolean backup_battinf(){
+ boolean en=false;
+ {
+ Database_backup baseup=new Database_backup();
+ baseup.setBackup_en(1);
+ baseup.setDatabase_name("db_battinf");
+ baseup.setTable_name("tb_battinf");
+ (new Database_backupImpl()).update(baseup);
+ for (int i = 0; i < 20; i++) {
+ boolean b=(new Database_backupImpl()).serchTable_en(baseup);
+ if(b){
+ en=true;
+ }else{
+ try {
+ Thread.sleep(250);
+ } catch (InterruptedException e) {
+ // TODO Auto-generated catch block
+ e.printStackTrace();
+ }
+ }
+ }
+ };//鍑虹幇鍒犻櫎鎿嶄綔鏃讹紝鍏堝浠芥暟鎹簱琛�
+ return en;
+ }
+
}
diff --git a/gx_tieta/src/com/fgkj/dao/impl/BadBatt_monImpl.java b/gx_tieta/src/com/fgkj/dao/impl/BadBatt_monImpl.java
index 04aeb5e..929f9f1 100644
--- a/gx_tieta/src/com/fgkj/dao/impl/BadBatt_monImpl.java
+++ b/gx_tieta/src/com/fgkj/dao/impl/BadBatt_monImpl.java
@@ -304,8 +304,8 @@
"and db_battinf.tb_battinf.stationname1 like ? and db_battinf.tb_battinf.stationname like ? and db_battinf.tb_battinf.stationname2 like ? and db_battinf.tb_battinf.stationname5 like ? ";
//閫夊彇钃勭數姹犵粍鏉′欢
- String idSqlT=" and db_battinf.tb_battinf.battgroupid!=? ";
- String idSqlF=" and db_battinf.tb_battinf.battgroupid=? ";
+ String idSqlT=" and db_battinf.tb_battinf.battgroupid!=? and db_battinf.tb_battinf.Station_install=1 ";
+ String idSqlF=" and db_battinf.tb_battinf.battgroupid=? and db_battinf.tb_battinf.Station_install=1 ";
if(binf.getBattGroupId()==0){
baseSql+=idSqlT;
}else{
diff --git a/gx_tieta/src/com/fgkj/dao/impl/BattInfImpl.java b/gx_tieta/src/com/fgkj/dao/impl/BattInfImpl.java
index df1f70b..992983c 100644
--- a/gx_tieta/src/com/fgkj/dao/impl/BattInfImpl.java
+++ b/gx_tieta/src/com/fgkj/dao/impl/BattInfImpl.java
@@ -12,6 +12,7 @@
import javax.persistence.Id;
import javax.sql.ConnectionEvent;
+import javax.swing.text.StyledEditorKit.BoldAction;
import sun.security.action.GetBooleanAction;
@@ -94,7 +95,13 @@
}
}
}
- boolean bl=DAOHelper.makeManualCommit(DBUtil.getConn(), sql_str);
+ Boolean bl=false;
+ boolean en=BattinfGroupFactory.backup_battinf();
+ if(en){
+ bl=DAOHelper.makeManualCommit(DBUtil.getConn(), sql_str);
+ }else{
+ return false;
+ }
(new User_logService()).addPro(listU);//灏嗙敤鎴风殑鎿嶄綔璁板綍涓嬫潵
return bl;
@@ -132,8 +139,16 @@
}
}
}
+
+
+ Boolean bl=false;
+ boolean en=BattinfGroupFactory.backup_battinf();
+ if(en){
+ bl=DAOHelper.makeManualCommit(DBUtil.getConn(), sql_str);
+ }else{
+ return false;
+ }
(new User_logService()).addPro(listU);//灏嗙敤鎴风殑鎿嶄綔璁板綍涓嬫潵
- Boolean bl=DAOHelper.makeManualCommit(DBUtil.getConn(), sql_str);
return bl;
}
//淇敼鐢垫睜淇℃伅閰嶇疆(ip鍦板潃,鎺╃爜鍜岀綉鍏�)
@@ -152,19 +167,6 @@
}
//鍒犻櫎鐢垫睜缁�(澶氫釜)
public boolean del(Object obj) {
- {
- Database_backup baseup=new Database_backup();
- baseup.setBackup_en(1);
- baseup.setDatabase_name("db_battinf");
- baseup.setTable_name("tb_battinf");
- (new Database_backupImpl()).update(baseup);
- try {
- Thread.sleep(1000*3);
- } catch (InterruptedException e) {
- // TODO Auto-generated catch block
- e.printStackTrace();
- }
- };//鍑虹幇鍒犻櫎鎿嶄綔鏃讹紝鍏堝浠芥暟鎹簱琛�
List<BattInf> list=(List<BattInf>) obj;
ArrayList sql_str=new ArrayList();
List<User_log> listU=new ArrayList<User_log>();//瀛樻斁user_log
@@ -180,8 +182,14 @@
}
}
}
+ Boolean bl=false;
+ boolean en=BattinfGroupFactory.backup_battinf();
+ if(en){
+ bl=DAOHelper.makeManualCommit(DBUtil.getConn(), sql_str);
+ }else{
+ return false;
+ }
(new User_logService()).addPro(listU);//灏嗙敤鎴风殑鎿嶄綔璁板綍涓嬫潵
- Boolean bl=DAOHelper.makeManualCommit(DBUtil.getConn(), sql_str);
return bl;
}
//鏍规嵁缁存姢鍖哄拰鏈烘埧鍚嶇О鏌ヨ鐢垫睜缁勪俊鎭�(鐢垫睜缁勪俊鎭厤缃�)
@@ -191,7 +199,7 @@
Page page=bmd.getPage();
Connection conn= DBUtil.getConn();
String numberSql=" SELECT FOUND_ROWS() number";
- String sql="select SQL_CALC_FOUND_ROWS distinct(StationId),StationName1,StationName2,StationName3,StationName4,StationName5,StationIp,FBSDeviceId,FbsDeviceIp_YM,FbsDeviceIp_WG,FbsDeviceIp,"
+ String sql="select SQL_CALC_FOUND_ROWS distinct(StationId),StationName,StationName1,StationName2,StationName3,StationName4,StationName5,StationIp,FBSDeviceId,FbsDeviceIp_YM,FbsDeviceIp_WG,FbsDeviceIp,"
+ "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,Station_install " +
" From db_battinf.tb_battinf " +
@@ -208,6 +216,7 @@
while (rs.next()) {
BattInf binf = new BattInf();
binf.setStationId(rs.getString("stationId"));
+ binf.setStationName(rs.getString("stationName"));
binf.setStationName1(rs.getString("stationName1"));
binf.setStationName2(rs.getString("stationName2"));
binf.setStationName3(rs.getString("stationName3"));
diff --git a/gx_tieta/src/com/fgkj/dao/impl/Battalarm_data_historyImpl.java b/gx_tieta/src/com/fgkj/dao/impl/Battalarm_data_historyImpl.java
index f550002..fa5d6e9 100644
--- a/gx_tieta/src/com/fgkj/dao/impl/Battalarm_data_historyImpl.java
+++ b/gx_tieta/src/com/fgkj/dao/impl/Battalarm_data_historyImpl.java
@@ -107,7 +107,7 @@
String baseSql = "select SQL_CALC_FOUND_ROWS distinct(db_alarm.tb_battalarm_data_history.BattGroupId),db_alarm.tb_battalarm_data_history.num,alm_signal_id,db_alarm.tb_battalarm_data_history.monnum,alm_value,alm_level,alm_is_confirmed,alm_confirmed_time,alm_start_time,alm_end_time, " +
" stationname,stationname5,battgroupname" +
" from db_alarm.tb_battalarm_data_history,db_battinf.tb_battinf " +
- " where alm_id in(?,?,?,?,?,?) and alm_signal_id%2 in(?,?) " +
+ " where alm_id in(?,?,?,?,?,?,?) and alm_signal_id%2 in(?,?) " +
" and alm_level in(?,?,?,?) " +
" and alm_start_time>=? and alm_start_time<=? " +
" and db_battinf.tb_battinf.stationname1 like ? and db_battinf.tb_battinf.stationname like ? and db_battinf.tb_battinf.stationname2 like ? and db_battinf.tb_battinf.stationname5 like ? ";
@@ -149,6 +149,7 @@
//System.out.println(sql);
List<Batt_Maint_Dealarm> list= DAOHelper.executeQueryLimit(sql,conn,
new Object[] {
+ mainf.getUsr_id(),
mainf.getFault_type_id(),
mainf.getFault_level(),
mainf.getRecord_uid(),
diff --git a/gx_tieta/src/com/fgkj/dao/impl/Database_backupImpl.java b/gx_tieta/src/com/fgkj/dao/impl/Database_backupImpl.java
index f71a1ca..915cb23 100644
--- a/gx_tieta/src/com/fgkj/dao/impl/Database_backupImpl.java
+++ b/gx_tieta/src/com/fgkj/dao/impl/Database_backupImpl.java
@@ -222,7 +222,37 @@
}
return number;
}
-
+ //鏌ヨ鍏蜂綋鏌愬紶琛ㄦ槸鍚﹀凡缁忓畬鎴愬浠�
+ public boolean serchTable_en(Object obj){
+ Database_backup baseup=(Database_backup) obj;
+ boolean bl=false;
+ String sql="select backup_en from web_site.tb_database_backup " +
+ " where database_name=? and table_name=? limit 1 ";
+ List list=DAOHelper.executeQuery(sql, DBUtil.getConn(), new Object[]{baseup.getDatabase_name(),baseup.getTable_name()}, new CallBack() {
+
+ public List getResults(ResultSet rs) {
+ List list=new ArrayList();
+ try {
+ while(rs.next()){
+ list.add(rs.getInt("backup_en"));
+ }
+ } catch (SQLException e) {
+ // TODO Auto-generated catch block
+ e.printStackTrace();
+ }
+ return list;
+ }
+ });
+ if(list!=null&&list.size()>0){
+ int backup_en=(Integer) list.get(list.size()-1);
+ if (backup_en==2) {
+ bl=true;
+ } else {
+ bl=false;
+ }
+ }
+ return bl;
+ }
public List serchByInfo(Object obj) {
// TODO Auto-generated method stub
return null;
--
Gitblit v1.9.1