didiyu
2018-12-10 6382c2a4220ff5774dba39848c2faabf0f7002f1
Merge branch 'dev_lxw' of https://didiyu@gitlab.com/whyclxw1/gx_tieta.git into dev_lxw
12个文件已修改
371 ■■■■ 已修改文件
gx_tieta/WebRoot/control.jsp 4 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
gx_tieta/WebRoot/css/common.css 6 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
gx_tieta/WebRoot/ele-param1.jsp 76 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
gx_tieta/WebRoot/eleHistoryWarn.jsp 13 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
gx_tieta/WebRoot/iframe/batt-info-add.html 19 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
gx_tieta/WebRoot/iframe/batt-info-edit.html 136 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
gx_tieta/WebRoot/js/dischargetest/sysData.js 8 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
gx_tieta/src/com/fgkj/dao/BattinfGroupFactory.java 29 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
gx_tieta/src/com/fgkj/dao/impl/BadBatt_monImpl.java 4 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
gx_tieta/src/com/fgkj/dao/impl/BattInfImpl.java 43 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
gx_tieta/src/com/fgkj/dao/impl/Battalarm_data_historyImpl.java 3 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
gx_tieta/src/com/fgkj/dao/impl/Database_backupImpl.java 30 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
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>
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;
gx_tieta/WebRoot/ele-param1.jsp
@@ -483,14 +483,80 @@
                
                // 编辑电池组信息
                function editBattGroup(obj) {
                    $('#iframeEdit').data('data', obj.data);
                    //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') {    // 电池组ID
                                            _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'
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;
        }
        
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);
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">电池组ID</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>
@@ -332,6 +300,51 @@
                    <input type="text" name="install_user" id="insperson" autocomplete="off" class="layui-input" value="{{= d.install_user }}">
                </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">电池组ID</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>
@@ -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,7 +467,7 @@
                     var home = _data.StationName3;            // 机房名称
                     var bts = _data.StationName4;            // 设备名称
                     _data.StationName = province+'-'+city+'-'+home+'-'+bts;
                     var temp = [_data];
                     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>
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(整数)'
    });
    
    
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表中数据进行增删改的操作时,先备份db_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;
    }
}
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{
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"));
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(),
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;