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

whyclj

2019-01-02 f99e01a5e62998ea3ccdd3e74c51bc6a0ca68bb9

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

 gx_tieta/WebRoot/ex-battinfo.jsp

@@ -481,7 +481,7 @@
                

                // 跳转到实时页面

                function controlPage(data) {

                    console.log(data);

                    // console.log(data);

                    var home = data.StationName;

                    var province = data.StationName1;

                    var city = data.StationName2;

@@ -550,7 +550,7 @@
                        ,complete: function() {

                            layer.close(load);

                            // 启动自动刷新

                            //updateSearch();

                            updateSearch();

                        }

                    });

                }

@@ -581,6 +581,7 @@
                            //console.log(res);

                            var rs = JSON.parse(res.result);

                            var resData = [];

                            var isUpdateTbl = false;

                            if(rs.code == 1) {

                                var data = rs.data;

                                // console.log(data);

@@ -588,17 +589,22 @@
                                for(var i=0; i<data.length; i++) {

                                    var _data = data[i];

                                    var _tmp = formaterResData(_data);

									
                                    if(_data.apply_note != Page.all) {

                                    resData.push(_tmp);

                                    Page.setAll(_data.apply_note);

                                        isUpdateTbl = true;

                                    }

                                }

                            }else {

                                Page.setAll(0);

                            }

                            // console.log(isUpdateTbl);

                            if(isUpdateTbl) {

                            $('#applyNum').text(Page.all);     // 设置徽章

                            tOptions.data = resData;    //  设置表格的数据

							
                            // 生成表格数据

                            table.reload('pageTbl', tOptions);

                                table.render(tOptions);

                            }

                            

                            // 实时回调

                            updateSearch.timer = setTimeout(updateSearch, 4000);

@@ -645,7 +651,7 @@
                            

                            // 生成表格数据

                            table.render(acceptOptions);

                            console.log(table);

                            // console.log(table);

                        }

                        ,complete: function() {

                            layer.close(load);


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

@@ -4,7 +4,11 @@


import com.fgkj.dao.BaseDAO;

import com.fgkj.dao.BaseDAOFactory;

import com.fgkj.dao.BattTestData;

import com.fgkj.dao.ProcessServerDao;

import com.fgkj.dao.impl.Battinf_applyImpl;

import com.fgkj.dao.impl.Process_surveyImpl;

import com.fgkj.dto.Process_survey;

import com.fgkj.dto.ServiceModel;



public class Battinf_applyService {

@@ -20,6 +24,11 @@
    public ServiceModel update(Object obj){

        boolean bl=dao.update(obj);

        if(bl){

            BattTestData.run_cmd();

            //将告警的服务设为重启

            Process_survey process=new Process_survey();

            process.setProcessName(ProcessServerDao.BMS_FBSDEV_ALARM_BATT);

            Boolean b=(new Process_surveyImpl()).update(process);

            model.setCode(1);

            model.setMsg("申请成功!");

        }else{