Merge branch 'dev_lxw' of https://whychdw@gitlab.com/whyclxw1/gx_tieta.git ...

hdw

2018-12-14 b57421be61dc67812ec97b169fbe2c193319d510

Merge branch 'dev_lxw' of https://whychdw@gitlab.com/whyclxw1/gx_tieta.git into dev_lxw

 gx_tieta/WebRoot/mobil/batt-approved.html

@@ -138,9 +138,11 @@
 <script type="text/javascript">

          /* 获取点击的是哪个按钮   */

          function getButIndex(t){

                //console.warn($(t).attr("but-index"));

                var index = $(t).attr("but-index");   

                index=(index/33-1);

                   console.info(index);

                   setcookiedit(index);

                   //window.location.href="control.html"; 	
                return ;

            }

    

@@ -154,17 +156,7 @@
    };



       

    $("#edit").click(function(){

        window.location.href="batt-infor-conf-temp.html";   
    });

    $("#delete").click(function(){  //删除电池组

        var temp = getCookie("eleparm");

        temp = JSON.parse(temp);

        console.info(temp);

        var parm = getUpdateArr(temp);

        delBatt(parm);

       // window.location.href="batt-infor-conf-delete.html";   
    });

    
     

    var arrTh = [ '机房编号', '省', '城市','区县','机房名称','设备名称','机房IP','FBS设备ID(重要)','FBS设备IP(重要)','子网掩码','网关','FBS设备名称','FBS电池索引(0-3)','电池组ID','机房内电池组编号','电池组名称','浮充电压阀值(V)','离线电压阀值(V)','浮充电流阀值(A)','单体数量','标称容量(AH)','标称单体电压(V)','标称单体内阻(mΩ)','标称单体电导','单体电压次低偏移量(V)','负载电流(A)','最大核容电流(A)','基站号码','电池品牌','电池型号','电池生产日期','投入使用日期','安装人员','查看电池组实时数据'];

    dataArr = [];

@@ -190,7 +182,7 @@
        return obj;

    }

    // 查询内容

    function searchBattLife(){

/*    function searchBattLife(){

        var temp = JSON.stringify(getcreatArr());

        console.info(temp);

        arrTd = new Array();

@@ -247,7 +239,7 @@
             createTbl(tblCon, arrTh, arrTd);

             }

         });            

    }

    }*/

        

         function setcookiedit(index){

                 var arrcookie = new Array();    

@@ -258,8 +250,51 @@
                       //console.info(value);

                       arrcookie.push(arrTd[value]);

                   }

                   console.info(arrcookie);

                   var temp = arrcookie;

                       var battarr = {

                       StationId : temp[0],    // 机房编号

                    StationName : (temp[1]+"-"+temp[2]+"-"+temp[4]+"-"+temp[5]),    // 拼接机房名称

                    StationName1 :temp[1],        // 省

                    StationName2 : temp[2],        // 市

                    StationName5 : temp[3],        // 区/县

                    StationName3 : temp[4],        // 机房名称

                    StationName4 :temp[5],        // 设备名称

                    StationIp : temp[6],                //机房ip

                    FBSDeviceId : temp[7],                //设备id

                    FbsDeviceIp : temp[8],                //设备ip

                    FbsDeviceIp_YM : temp[9],            // 设备掩码

                    FbsDeviceIp_WG : temp[10],            // 网关

                    FBSDeviceName : temp[11],            //设备名称

                    GroupIndexInFBSDevice : temp[12],    //fbs设备索引

                    BattGroupId : temp[13],                //电池组id

                    BattGroupNum : temp[14],            //机房内电池组编号

                    BattGroupName : temp[15],        //电池组索引

                    FloatVolLevel : temp[16],            //浮充电压阀值

                    OfflineVolLevel : temp[17],            //离线电压阀值

                    BattFloatCurrent : temp[18],        //浮充电流阀值

                    MonCount : temp[19],                //单体数量

                    MonCapStd : temp[20],                //标称容量

                    MonVolStd : temp[21],                //标称电压

                    MonResStd : temp[22],                //标称内阻

                    MonSerStd : temp[23],                //标称电导

                    MonVolLowToAvg : temp[24],            //单体电压次低偏移量

			
                    Load_curr : temp[25],                //负载电流

                    DisCurrMax : temp[26],                //最大核容电流

                    station_phone : temp[27],            //基站号码

									
                    BattProducer : temp[28],            //电池品牌

                    BattModel : temp[29],                //电池型号

                    BattProductDate :  temp[30]+" 00:00:00",        //电池生产日期

                    BattInUseDate :  temp[31]+" 00:00:00",            //电池使用日期

                    install_user : temp[32],            //安装人员

                   }

                   var json1 = window.JSON.stringify(battarr);

                   console.info(battarr);

                   var json=window.JSON.stringify(arrcookie);

                   setCookie("eleparm",json);  //这里setcookie,若有上一条cookie则清空上一笔

                 setCookie("batt",json1);

         }

         

         function setcookieCreat(index){

@@ -283,28 +318,28 @@
                   setCookie("eleparm",json);  //这里setcookie,若有上一条cookie则清空上一笔

         }

        

/*    // 查询内容

    // 查询内容

        function searchBattLife(){

            

        

            /* 模拟数据做好就删！！！！！！！！ */

            

        /*    for(i=0;i<340;i++){

             if(i%34==33){

             //<a href="count-report.html" target="_top" class="ui-btn ui-corner-all ui-shadow ui-icon-back ui-btn-icon-left" style="padding-top: 0.7em; padding-bottom: 0.7em;">返回</a>

            arrTd[i]='<a href=""  class="ui-btn ui-btn-inline ui-corner-all operat-but" data-position-to="window" >电池组实时数据</a>';

            console.warn(i);

            continue;

            for(var i=0;i<340;i++){

                if(i%34==33){

                //<a href="count-report.html" target="_top" class="ui-btn ui-corner-all ui-shadow ui-icon-back ui-btn-icon-left" style="padding-top: 0.7em; padding-bottom: 0.7em;">返回</a>

                console.info(i);

                arrTd[i]='<a onclick="getButIndex(this)"  class="ui-btn ui-btn-inline ui-corner-all operat-but" data-position-to="window"'+'but-index='+i+'>电池组实时数据</a>';

				
                continue;

            

            } 
			       
                     arrTd[i]=i*10;

                    }

            }   
                arrTd[i]=i*10;

            }

                        

                    createTbl(tblCon, arrTh, arrTd);

            createTbl(tblCon, arrTh, arrTd);

                    

            /* 模拟数据做好就删！！！！！！！！ */                

        //}

        }



        function getUpdateArr(temp){

            var arr = new Array();


 gx_tieta/WebRoot/mobil/batt-unapproved.html

@@ -87,12 +87,16 @@
            margin: 0;

            padding-top: 0.1em;

            padding-bottom: 0.1em;

            background-color: #dddddd4d!important;

        }

        .ui-table-reflow td .ui-table-cell-label, .ui-table-reflow th .ui-table-cell-label{

            width:35%;

        } 

        .tbl-container td {

            color: #fb0909a3;

        }

        .fr{

            float:right;

        }    

    </style>

    <link rel="stylesheet" href="css/fgpanel.css">

@@ -126,8 +130,8 @@
        </div>  

        <div data-role="popup" id="myPopup" class="ui-content" data-overlay-theme="b">

        <a href="#" data-rel="back" class="ui-btn ui-corner-all ui-shadow ui-btn ui-icon-delete ui-btn-icon-notext ui-btn-right">关闭</a>

        <a href="" id="edit" class="ui-btn ui-corner-all ui-shadow  ui-btn-icon-left ui-icon-edit" >修改</a>	  
        <a href="" id="delete" class="ui-btn ui-corner-all ui-shadow  ui-btn-icon-left ui-icon-forbidden"  data-icon="delete">删除</a>

        <a href="" id="delete" class="ui-btn ui-corner-all ui-shadow  ui-btn-icon-left ui-icon-check" >确定删除</a>	  
        <a href="" id="" class="ui-btn ui-corner-all ui-shadow  ui-btn-icon-left ui-icon-forbidden"  data-icon="delete">取消删除</a>

        </div>    

        

    </div>    

@@ -144,10 +148,21 @@


 <script type="text/javascript">

        /* 获取点击的是哪个按钮   */

    function getButIndex(t){

        //console.warn($(t).attr("but-index"));

    function getDeleteButIndex(t){

        console.warn($(t).attr("but-index")+' 删除');

        var index = $(t).attr("but-index");  
        console.info(index); 
           setcookiedit(index);

           //var parm = battDeleteparm();

        //console.info(parm);

        //delBatt(parm);

        return ;

    }

    function getEditButIndex(t){

        console.warn($(t).attr("but-index")+' 修改');

        var index = $(t).attr("but-index");   

           setcookiedit(index);

           window.location.href="batt-infor-unapproved-edit.html";  
        return ;

    }

    

@@ -172,7 +187,7 @@
        //window.location.href="batt-unapproved.html";   

    });

     

    var arrTh = [ '机房编号', '省', '城市','区县','机房名称','设备名称','机房IP','FBS设备ID(重要)','FBS设备IP(重要)','子网掩码','网关','FBS设备名称','FBS电池索引(0-3)','电池组ID','机房内电池组编号','电池组名称','浮充电压阀值(V)','离线电压阀值(V)','浮充电流阀值(A)','单体数量','标称容量(AH)','标称单体电压(V)','标称单体内阻(mΩ)','标称单体电导','单体电压次低偏移量(V)','负载电流(A)','最大核容电流(A)','基站号码','电池品牌','电池型号','电池生产日期','投入使用日期','安装人员','操作'];

    var arrTh = [ '机房编号', '省', '城市','区县','机房名称','设备名称','机房IP','FBS设备ID(重要)','FBS设备IP(重要)','子网掩码','网关','FBS设备名称','FBS电池索引(0-3)','电池组ID','机房内电池组编号','电池组名称','浮充电压阀值(V)','离线电压阀值(V)','浮充电流阀值(A)','单体数量','标称容量(AH)','标称单体电压(V)','标称单体内阻(mΩ)','标称单体电导','单体电压次低偏移量(V)','负载电流(A)','最大核容电流(A)','基站号码','电池品牌','电池型号','电池生产日期','投入使用日期','安装人员',''];

    dataArr = [];

    var startTime = "1980-01-01";

    var endTime = new Date().format('yyyy-MM-dd');

@@ -194,7 +209,7 @@
    }

    // 查询内容

    function searchBattLife(){

        var temp = JSON.stringify(getcreatArr());

         var temp = JSON.stringify(getcreatArr());

        console.info(temp);

        arrTd = new Array();

         var index = 0;

@@ -243,15 +258,28 @@
                     arrTd[index++] = data[i].binf.BattProductDate.substr(0,10);

                     arrTd[index++] = data[i].binf.BattInUseDate.substr(0,10);

                     arrTd[index++] = data[i].binf.install_user;

                     arrTd[index++] = '<a onclick="getButIndex(this)" href="#myPopup" id="butt" data-rel="popup" class="ui-btn ui-btn-inline ui-corner-all operat-but" data-position-to="window"'+'but-index='+i+'>修改或删除</a>';continue;

                     }

                     arrTd[index++]='<a onclick="getEditButIndex(this)"  id="edit" class="ui-btn ui-btn-inline ui-corner-all operat-but" data-position-to="window"'+'but-index='+i+'>修改</a>'+'<a onclick="getDeleteButIndex(this)" href="#myPopup" id="" data-rel="popup"  class="ui-btn ui-btn-inline ui-corner-all operat-but fr" data-position-to="window"'+'but-index='+i+'>删除</a>';

                     }

                 }

             

             setPage();

             createTbl(tblCon, arrTh, arrTd);        

             }

         });			
    }

         });			 
     }	
         /*    for(i=0;i<340;i++){

             if(i%34==33){

            arrTd[i]='<a onclick="getEditButIndex(this)"  id="edit" class="ui-btn ui-btn-inline ui-corner-all operat-but" data-position-to="window"'+'but-index='+i+'>修改</a>'+'<a onclick="getDeleteButIndex(this)" href="#myPopup" id="" data-rel="popup"  class="ui-btn ui-btn-inline ui-corner-all operat-but fr" data-position-to="window"'+'but-index='+i+'>删除</a>';

			
            continue;

			
            } 
			       
                     arrTd[i]=i*10;

                    }

						
                    createTbl(tblCon, arrTh, arrTd);

    }*/

    

        function searchHomeInfoByName(id) {

                    var groupName = new Array();

@@ -390,7 +418,7 @@
            }

            arr.push(obj);

        //}

        console.info(arr);

        //console.info(arr);

        return arr;

        

    }


 gx_tieta/src/com/fgkj/actions/BattInfAction.java

@@ -101,7 +101,12 @@
        return SUCCESS;

    }

    

    
    //添加操作时查询出电池组id

    public String searchMaxBattgroupId(){

        model = service.searchMaxBattgroupId();

        result = ActionUtil.tojson(model);

        return SUCCESS;

    }

    public String searchAll() {

        model = service.searchAll();

        result = ActionUtil.tojson(model);


 gx_tieta/src/com/fgkj/dao/impl/BattInfImpl.java

@@ -132,11 +132,11 @@
                          "MonCount="+binf.getMonCount()+",MonCapStd="+binf.getMonCapStd()+",monVolStd="+binf.getMonVolStd()+",monResStd="+binf.getMonResStd()+",MonSerStd="+binf.getMonSerStd()+",MonVolLowToAvg="+binf.getMonVolLowToAvg()+",BattProducer='"+binf.getBattProducer()+"',BattModel='"+binf.getBattModel()+"',BattProductDate='"+DAOHelper.sdf.format(binf.getBattProductDate())+"',BattInUseDate='"+DAOHelper.sdf.format(binf.getBattInUseDate())+"', "

                         +" Load_curr="+binf.getLoad_curr()+",install_user='"+binf.getInstall_user()+"',DisCurrMax="+binf.getDisCurrMax()+",station_phone='"+binf.getStation_phone()+"',Station_install="+binf.getStation_install()+"  where battgroupId="+binf.getBattGroupId();*/

                String sql = "replace into db_battinf.tb_battinf(" +

                        "StationName,StationName1,StationName2,StationName3,StationName4,StationName5,StationIp,FbsDeviceIp_YM,FbsDeviceIp_WG,"

                        "StationId,StationName,StationName1,StationName2,StationName3,StationName4,StationName5,StationIp,FBSDeviceId,FbsDeviceIp,FbsDeviceIp_YM,FbsDeviceIp_WG,"

                        + "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" +

                        ") values('"+binf.getStationName()+"','"+binf.getStationName1()+"','"+binf.getStationName2()+"','"+binf.getStationName3()+"','"+binf.getStationName4()+"','"+binf.getStationName5()+

                        "','"+binf.getStationIp()+"','"+binf.getFbsDeviceIp_YM()+"','"+binf.getFbsDeviceIp_WG()+"','"+binf.getFBSDeviceName()+"',"+binf.getGroupIndexInFBSDevice()+

                        ") values('"+binf.getStationId()+"','"+binf.getStationName()+"','"+binf.getStationName1()+"','"+binf.getStationName2()+"','"+binf.getStationName3()+"','"+binf.getStationName4()+"','"+binf.getStationName5()+

                        "','"+binf.getStationIp()+"',"+binf.getFBSDeviceId()+",'"+binf.getFbsDeviceIp()+"','"+binf.getFbsDeviceIp_YM()+"','"+binf.getFbsDeviceIp_WG()+"','"+binf.getFBSDeviceName()+"',"+binf.getGroupIndexInFBSDevice()+

                        ","+binf.getBattGroupId()+","+binf.getBattGroupNum()+",'"+binf.getBattGroupName()+"',"+binf.getFloatVolLevel()+","+binf.getOfflineVolLevel()+","+binf.getBattFloatCurrent()+

                        ","+binf.getMonCount()+","+binf.getMonCapStd()+","+binf.getMonVolStd()+","+binf.getMonResStd()+","+binf.getMonSerStd()+","+binf.getMonVolLowToAvg()+

                        ",'"+binf.getBattProducer()+"','"+binf.getBattModel()+"','"+DAOHelper.sdf.format(binf.getBattProductDate())+"','"+DAOHelper.sdf.format(binf.getBattInUseDate())+"',"+binf.getLoad_curr()+",'"+binf.getInstall_user()+"',"+binf.getDisCurrMax()+",'"+binf.getStation_phone()+"',"+binf.getStation_install()+")";


 gx_tieta/src/com/fgkj/dao/impl/Battinf_applyImpl.java

@@ -138,11 +138,11 @@
                         +" Load_curr="+binf.getLoad_curr()+",install_user='"+binf.getInstall_user()+"',DisCurrMax="+binf.getDisCurrMax()+",station_phone='"+binf.getStation_phone()+"'  where num="+bapply.getNum();

                */

                String sql_update_apply = "replace into db_battinf.tb_battinf_apply(" +

                        ",StationName,StationName1,StationName2,StationName3,StationName4,StationName5,StationIp,"

                        "apply_uid,apply_date,StationId,StationName,StationName1,StationName2,StationName3,StationName4,StationName5,StationIp,FBSDeviceId,FbsDeviceIp,FbsDeviceIp_YM,FbsDeviceIp_WG,"

                        + "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" +

                        ") values('"+binf.getStationName()+"','"+binf.getStationName1()+"','"+binf.getStationName2()+"','"+binf.getStationName3()+"','"+binf.getStationName4()+"','"+binf.getStationName5()+

                        "','"+binf.getStationIp()+"','"+binf.getFBSDeviceName()+"',"+binf.getGroupIndexInFBSDevice()+

                        ") values("+bapply.getApply_uid()+",'"+DAOHelper.sdf.format(bapply.getApply_date())+"','"+binf.getStationId()+"','"+binf.getStationName()+"','"+binf.getStationName1()+"','"+binf.getStationName2()+"','"+binf.getStationName3()+"','"+binf.getStationName4()+"','"+binf.getStationName5()+

                        "','"+binf.getStationIp()+"',"+binf.getFBSDeviceId()+",'"+binf.getFbsDeviceIp()+"','"+binf.getFbsDeviceIp_YM()+"','"+binf.getFbsDeviceIp_WG()+"','"+binf.getFBSDeviceName()+"',"+binf.getGroupIndexInFBSDevice()+

                        ","+binf.getBattGroupId()+","+binf.getBattGroupNum()+",'"+binf.getBattGroupName()+"',"+binf.getFloatVolLevel()+","+binf.getOfflineVolLevel()+","+binf.getBattFloatCurrent()+

                        ","+binf.getMonCount()+","+binf.getMonCapStd()+","+binf.getMonVolStd()+","+binf.getMonResStd()+","+binf.getMonSerStd()+","+binf.getMonVolLowToAvg()+

                        ",'"+binf.getBattProducer()+"','"+binf.getBattModel()+"','"+DAOHelper.sdf.format(binf.getBattProductDate())+"','"+DAOHelper.sdf.format(binf.getBattInUseDate())+"',"+binf.getLoad_curr()+",'"+binf.getInstall_user()+"',"+binf.getDisCurrMax()+",'"+binf.getStation_phone()+"')";


 gx_tieta/src/com/fgkj/services/BattInfServices.java

@@ -1022,7 +1022,12 @@
        model.setData(dev_id);

        return model;

    }

    
    //添加操作时查询出电池组id

    public ServiceModel searchMaxBattgroupId(){

        int battgroupid=BattinfGroupFactory.searchMaxBattgroupId();

        model.setData(battgroupid);

        return model;

    }

    public static void main(String[] args) {

        //new BattInfServices().findMenu();

        BattInf b=new BattInf();