D:/workspace/chenjingjing/git/gx_tieta/gx_tieta/.gitignore
2019-01-09 0cd906c45db3badb02753a1988904ca7876b6d1a
Merge branch 'dev_lxw' of https://whyccjj@gitlab.com/whyclxw1/gx_tieta.git into dev_lxw
1个文件已添加
12个文件已修改
143 ■■■■■ 已修改文件
gx_tieta/WebRoot/WEB-INF/classes/com/fgkj/actions/ram/Fbs9100_sysparamAction$2.class 补丁 | 查看 | 原始文档 | blame | 历史
gx_tieta/WebRoot/WEB-INF/classes/com/fgkj/actions/ram/Fbs9100_sysparamAction.class 补丁 | 查看 | 原始文档 | blame | 历史
gx_tieta/WebRoot/WEB-INF/classes/com/fgkj/dao/impl/ram/Fbs9100_setparamImpl$1.class 补丁 | 查看 | 原始文档 | blame | 历史
gx_tieta/WebRoot/WEB-INF/classes/com/fgkj/dao/impl/ram/Fbs9100_setparamImpl$2.class 补丁 | 查看 | 原始文档 | blame | 历史
gx_tieta/WebRoot/WEB-INF/classes/com/fgkj/dao/impl/ram/Fbs9100_setparamImpl$3.class 补丁 | 查看 | 原始文档 | blame | 历史
gx_tieta/WebRoot/WEB-INF/classes/com/fgkj/dao/impl/ram/Fbs9100_setparamImpl.class 补丁 | 查看 | 原始文档 | blame | 历史
gx_tieta/WebRoot/WEB-INF/classes/com/fgkj/services/ram/Fbs9100_sysparamService.class 补丁 | 查看 | 原始文档 | blame | 历史
gx_tieta/WebRoot/bat-set-test.jsp 27 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
gx_tieta/WebRoot/batch-set-curr.jsp 34 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
gx_tieta/WebRoot/iframe/setcurr.html 6 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
gx_tieta/src/com/fgkj/actions/ram/Fbs9100_sysparamAction.java 11 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
gx_tieta/src/com/fgkj/dao/impl/ram/Fbs9100_setparamImpl.java 26 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
gx_tieta/src/com/fgkj/services/ram/Fbs9100_sysparamService.java 39 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
gx_tieta/WebRoot/WEB-INF/classes/com/fgkj/actions/ram/Fbs9100_sysparamAction$2.class
Binary files differ
gx_tieta/WebRoot/WEB-INF/classes/com/fgkj/actions/ram/Fbs9100_sysparamAction.class
Binary files differ
gx_tieta/WebRoot/WEB-INF/classes/com/fgkj/dao/impl/ram/Fbs9100_setparamImpl$1.class
Binary files differ
gx_tieta/WebRoot/WEB-INF/classes/com/fgkj/dao/impl/ram/Fbs9100_setparamImpl$2.class
Binary files differ
gx_tieta/WebRoot/WEB-INF/classes/com/fgkj/dao/impl/ram/Fbs9100_setparamImpl$3.class
Binary files differ
gx_tieta/WebRoot/WEB-INF/classes/com/fgkj/dao/impl/ram/Fbs9100_setparamImpl.class
Binary files differ
gx_tieta/WebRoot/WEB-INF/classes/com/fgkj/services/ram/Fbs9100_sysparamService.class
Binary files differ
gx_tieta/WebRoot/bat-set-test.jsp
@@ -120,8 +120,8 @@
                                       <div class="layui-form-item">
                                           <div class="layui-input-block">
                                               <select name="sysType" id="sysType" lay-filter="sysType" lay-search="">
                                                   <option value="12">1U设备</option>
                                                <option value="2">2U设备</option>
                                                   <option value="12">12V设备</option>
                                                <option value="2">2V设备</option>
                                            </select>
                                           </div>
                                       </div>
@@ -818,6 +818,8 @@
                    batchSetBattParams(rsData, keyIds);
                });
                
                // 设置添加操作的字符串
                var addBattStr = '';
                // 批量设置放电参数
                function batchSetBattParams(params, keys) {
                    // 判断data的值是否为空
@@ -833,7 +835,7 @@
                            type: 'post'
                            ,async: true
                            ,url: 'Fbs9100_battparamAction_action_updatePro'
                            ,data: 'json='+JSON.stringify(params)
                            ,data: 'json='+JSON.stringify(params)+'&json_msg='+addBattStr
                            ,dataType: 'json'
                            ,success: function(res) {
                                var rs = JSON.parse(res.result);
@@ -906,12 +908,22 @@
                            var rs = JSON.parse(res.result);
                            //console.log(rs);
                            var data = [];
                            addBattStr = '';        // 初始化字符串
                            if(rs.code == 1) {
                                data = rs.data;
                                data = formatSearchData(data);
                            }else {
                                layer.msg('没有可设置的电池组!');
                            }
                            // 如果有添加的数据
                            if(data.length !=0) {
                                if(addBattStr.length == 0) {    // 字符串长度为0
                                    addBattStr += getFilterStr(temp);
                                }else {
                                    addBattStr += ','+getFilterStr(temp);
                                }
                            }
                            tOptions.data = data;
                            //console.log(data);
                               // 生成表格数据
@@ -1072,6 +1084,15 @@
                    }
                    return rs;
                }
                // 获取筛选条件的字符串
                function getFilterStr(data) {
                    var rsString = '';
                    rsString += data.StationName;
                    rsString += '-'+data.MonVolStd+'V设备';
                    rsString += '-'+(data.GroupIndexInFBSDevice == '0'?'电池组1': '电池组2');
                    return rsString;
                }
            });
        </script>
    </body>
gx_tieta/WebRoot/batch-set-curr.jsp
@@ -117,8 +117,8 @@
                                       <div class="layui-form-item">
                                           <div class="layui-input-block">
                                               <select name="sysType" id="sysType" lay-filter="sysType" lay-search="">
                                                   <option value="12">1U设备</option>
                                                <option value="2">2U设备</option>
                                                   <option value="12">12V设备</option>
                                                <option value="2">2V设备</option>
                                            </select>
                                           </div>
                                       </div>
@@ -565,6 +565,7 @@
                
                // 点击添加电池组
                $('#setCurrIframe').data('setCurr', []);
                $('#batchAdd').click(function() {
                    var structData = structAddData();
                    // 判断是否选择要添加的内容
@@ -578,7 +579,8 @@
                });
                
                
                // 设置添加操作的字符串
                var addBattStr = '';
                // 查询正在放电的设备
                function searchChargeDev(callback, cParam, isCallback) {
                    var rq = structAddData();        // 获取查询条件
@@ -589,6 +591,8 @@
                        devType = preDevType;
                        // 设备类型的条件改变清空表格
                        tOptions.data = [];
                        // 清空字符串
                        addBattStr = '';
                        // 查询正在放电的内容
                        $.ajax({
                            type: 'post'
@@ -667,6 +671,15 @@
                            var data = [];
                            if(rs.code == 1) {
                                data = getFilterData(rs.data, tOptions.data);
                            }
                            // 如果有添加的数据
                            if(data.length !=0) {
                                if(addBattStr.length == 0) {    // 字符串长度为0
                                    addBattStr += getFilterStr(temp);
                                }else {
                                    addBattStr += ','+getFilterStr(temp);
                                }
                            }
                            // 将数据添加到表格中
                            for(var i=0; i<data.length; i++) {
@@ -790,14 +803,14 @@
                
                // 请求设置参数
                function ajaxSetParam(param) {
                    console.log(param);
                    //console.log(param);
                    var load = layer.load(1);
                    // 请求后台
                    $.ajax({
                        type: 'post'
                        ,async: true
                        ,url: 'Fbs9100_setparamAction_action_updatePro'
                        ,data: 'json='+JSON.stringify(param)
                        ,data: 'json='+JSON.stringify(param)+'&json_msg='+addBattStr    // 添加操作记录
                        ,dataType: 'json'
                        ,success: function(res) {
                            var rs = JSON.parse(res.result);
@@ -984,7 +997,7 @@
                        layer.msg('暂无无法启动,请先设置放电参数!');
                        return;
                    }
                    $('#setCurrIframe').data('addBattStr', addBattStr);
                    // 显示面板
                    layer.open({
                        type: 2
@@ -1219,6 +1232,15 @@
                    return rs;
                }                
                
                // 获取筛选条件的字符串
                function getFilterStr(data) {
                    var rsString = '';
                    rsString += data.StationName;
                    rsString += '-'+data.MonVolStd+'V设备';
                    rsString += '-'+(data.GroupIndexInFBSDevice == '0'?'电池组1': '电池组2');
                    return rsString;
                }
            });
        </script>
    </body>
gx_tieta/WebRoot/iframe/setcurr.html
@@ -51,8 +51,8 @@
            var table = layui.table;
            
            var setCurr = parent.$('#setCurrIframe').data('setCurr');
            console.log(setCurr);
            var addBattStr = parent.$('#setCurrIframe').data('addBattStr');
            console.log(addBattStr);
            // 表格模块
            var tOptions = {
                elem: '#pageTbl'
@@ -133,7 +133,7 @@
                    type: 'post'
                    ,async: true
                    ,url: 'Fbs9100_setparamAction_action_updatePro_dis'
                    ,data: 'json='+JSON.stringify(param)
                    ,data: 'json='+JSON.stringify(param)+'&json_msg='+addBattStr
                    ,dataType: 'json'
                    ,success: function(res) {
                        var rs = JSON.parse(res.result);
gx_tieta/src/com/fgkj/actions/ram/Fbs9100_sysparamAction.java
@@ -51,6 +51,17 @@
        result = tojson(model);        
        return SUCCESS;    
    }
    //批量重启设备
    public String restartPL_FBS() {
        List<Fbs9100_sysparam> list=getGson().fromJson(json, new TypeToken<List<Fbs9100_sysparam>>(){}.getType());
        ServiceModel model = service.restartPL_FBS(list);
        {   String msg="批量重启"+json_msg+"的设备";
            User_log ulog=UinfDaoFactory.CreateULog(UinfDaoFactory.Batch, msg);
            uservice.add(ulog);//将用户的操作记录下来
        }
        result = tojson(model);
        return SUCCESS;
    }
    
    //根据设备id查询系统参数(一定是被管理的)
    public String serchByCondition(){
gx_tieta/src/com/fgkj/dao/impl/ram/Fbs9100_setparamImpl.java
@@ -21,6 +21,7 @@
import com.fgkj.dto.ram.FBS9100;
import com.fgkj.dto.ram.Fbs9100_setparam;
import com.fgkj.dto.ram.Fbs9100_state;
import com.fgkj.dto.ram.Fbs9100_sysparam;
import com.fgkj.services.User_logService;
public class Fbs9100_setparamImpl implements BaseDAO,CallBack{
@@ -119,7 +120,30 @@
                        + " op_cmd="+fs.getOp_cmd()+ ",TestCmd="+fs.getTestCmd()+ " WHERE dev_id= "+fs.getDev_id();
                sql_str.add(sql);
                {
                    String msg="启动"+fs.getDev_id()+"机房放电参数";
                    String msg="启动"+fs.getDev_id()+"机房放电";
                    User_log ulog=UinfDaoFactory.CreateULog(UinfDaoFactory.Alter, msg);
                    listU.add(ulog);
                 }
            }
        }
        Boolean bl=DAOHelper.makeManualCommit(DBUtil.getConn(), sql_str);
        (new User_logService()).addPro(listU);//将用户的操作记录下来
        return bl;
    }
    //批量重启
    public boolean restartPL_FBS(Object obj) {
        List<Fbs9100_sysparam> list=(List<Fbs9100_sysparam>) obj;
        ArrayList sql_str=new ArrayList();
        List<User_log> listU=new ArrayList<User_log>();//存放user_log
        if(list!=null&&list.size()>0){
            for (int i = 0; i < list.size(); i++) {
                Fbs9100_sysparam fs=list.get(i);
                String sql="UPDATE db_ram_db.tb_fbs9100_setparam  SET "
                        + " op_cmd="+fs.getOp_cmd()+ " WHERE dev_id= "+fs.getDev_id();
                sql_str.add(sql);
                {
                    String msg="重启"+fs.getDev_id()+"机房";
                    User_log ulog=UinfDaoFactory.CreateULog(UinfDaoFactory.Alter, msg);
                    listU.add(ulog);
                 }
gx_tieta/src/com/fgkj/services/ram/Fbs9100_sysparamService.java
@@ -120,6 +120,45 @@
          }
          return model;    
      }
    //批量重启设备
      public ServiceModel restartPL_FBS(Object obj) {
          boolean bl=(new Fbs9100_setparamImpl()).restartPL_FBS(obj);
          if(bl) {
            List<Fbs9100_sysparam> list=(List<Fbs9100_sysparam>) obj;
            Calendar c = Calendar.getInstance();
            //现在的时间(单位:毫秒)
            long now_time = c.getTimeInMillis();
            long time=0;
            int success=0;
            do {
                for (int i = 0; i < list.size(); i++) {
                    Fbs9100_sysparam fs=new Fbs9100_sysparam();
                    fs=list.get(i);
                    if(fs.getNum()==0) {//前台传参设置
                        boolean b=(new Fbs9100_setparamImpl()).getCmdAck(fs.getOp_cmd(), fs.getDev_id());
                        if(b) {
                            success+=1;
                            list.get(i).setNum(1);
                        }
                    }
                }
                if(success==list.size()) {
                    break;
                }
                Calendar cl = Calendar.getInstance();
                long moment_time = cl.getTimeInMillis();
                time=moment_time-now_time;
            }while(time<=5*1000);
            model.setData(list);
            model.setCode(1);
            model.setSum(success);
            model.setMsg("重启成功!");
        }else {
            model.setCode(0);
            model.setMsg("重启失败!");
        }
          return model;
      }
  //批量设置系统参数时,根据省市区,电池单体型号(伏数),组数筛选出电池组并读取它的实际系统参数
      public ServiceModel serchBattinfAndParam(Object obj) {
          List<BattInf> list=(new BattInfImpl()).serchBySys_param(obj);