Merge branch 'minhang' of http://222.66.0.204:8090/panzhaov5/bsth_control into minhang

潘钊
2 parents 75dd9f6e 66e42e2a
Showing 4 changed files with 354 additions and 382 deletions
src/main/java/com/bsth/service/oil/impl/YlbServiceImpl.java
src/main/resources/application-dev.properties
src/main/resources/static/pages/oil/list.html
src/main/resources/static/real_control_v2/mapmonitor/js/spatial_data.js
@@ -373,7 +373,10 @@ public class YlbServiceImpl extends BaseServiceImpl&lt;Ylb,Integer&gt; implements YlbS
 				if(t.getJcsx()==1){
 					Double jcyl=t.getCzyl();
 					zyl=jcyl+jzl-yl;
-					Double yh=Double.parseDouble(df.format(zyl*(t.getZlc()/zlc)));
+					Double yh=0.0;
+					if(zlc>0&&t.getZlc()>0){
+						yh=Double.parseDouble(df.format(zyl*(t.getZlc()/zlc)));
+					}
 					t.setYh(yh);
 					nextJzyl=t.getJzl()+t.getCzyl()-yh;
 					t.setJzyl(Double.parseDouble(df.format(nextJzyl)));
@@ -8,7 +8,7 @@ spring.jpa.hibernate.naming_strategy= org.hibernate.cfg.ImprovedNamingStrategy
 spring.jpa.database= MYSQL
 spring.jpa.show-sql= false
 spring.datasource.driver-class-name= com.mysql.jdbc.Driver
-spring.datasource.url= jdbc:mysql://192.168.168.201/control?useUnicode=true&characterEncoding=utf-8&useSSL=false
+spring.datasource.url= jdbc:mysql://192.168.168.201/mh_control?useUnicode=true&characterEncoding=utf-8&useSSL=false
 spring.datasource.username= root
 spring.datasource.password= 123456
 #DATASOURCE
@@ -10,7 +10,7 @@
     <li><span class="active">进出场存油量</span></li>
 </ul>
-<div class="row" id="liaolei_oil_list">
+<div class="row" id="ll_oil_list">
     <div class="col-md-12">
         <!-- Begin: life time stats -->
         <div class="portlet light portlet-fit portlet-datatable bordered">
@@ -214,7 +214,7 @@
 <script>
     $(function () {
         //var id = 15;
-        //$('.in_carpark_jzyl[data-id='+id+']', '#liaolei_oil_list')
+        //$('.in_carpark_jzyl[data-id='+id+']', '#ll_oil_list')
         $("#checkYl").on('click', function () {
             console.log("核对加注量");
@@ -264,14 +264,16 @@
         })
         //拆分
         $("#sortButton").on('click', function () {
-            console.log("拆分油量");
             if ($("#rq").val() != "") {
                 var id = $('input.icheck:checked').data('id');
+               
                 if (typeof(id) == 'undefined') {
                     layer.msg("请选择一行进行拆分");
                 } else {
                     //获取输入的进场存油
-                    var jzyl = $("#jzyl" + id).html();
+                    var jzyl =  $('.in_carpark_jzyl[data-id='+id+']', '#ll_oil_list').html();
+                   // $("#jzyl" + id).html();
+                   console.log(jzyl);
                     var params = {};
                     params['jzyl'] = jzyl;
                     params['id'] = id;
@@ -357,12 +359,10 @@
             if (p)
                 params = p;
             //更新时间排序
-            console.log(params);
             params['order'] = 'nbbm';
             params['page'] = page;
             params['rq'] = $("#rq").val();
             var i = layer.load(2);
-            console.log(params);
             $get('/ylb', params, function (data) {
                 $.each(data.content, function (i, obj) {
                     obj.rq = moment(obj.rq).format("YYYY-MM-DD");
@@ -379,7 +379,7 @@
                 }
                 layer.close(i);
-                startOptJzylLink($('#liaolei_oil_list .in_carpark_jzyl'));
+                startOptJzylLink($('#ll_oil_list .in_carpark_jzyl'));
             });
         }
@@ -466,47 +466,16 @@
         });
         //搜索线路
-        $('#xlbm').select2({
-            placeholder: '搜索线路...',
-            ajax: {
-                url: '/realSchedule/findLine',
-                type: 'post',
-                dataType: 'json',
-                delay: 150,
-                data: function (params) {
-                    return {line: params.term};
-                },
-                processResults: function (data) {
-                    return {
-                        results: data
-                    };
-                },
-                cache: true
-            },
-            templateResult: function (repo) {
-                if (repo.loading) return repo.text;
-                var h = '<span>' + repo.text + '</span>';
-                return h;
-            },
-            escapeMarkup: function (markup) {
-                return markup;
-            },
-            minimumInputLength: 1,
-            templateSelection: function (repo) {
-                return repo.text;
-            },
-            language: {
-                noResults: function () {
-                    return '<span style="color:red;font-size: 12px;">没有搜索到线路！</span>';
-                },
-                inputTooShort: function (e) {
-                    return '<span style="color:gray;font-size: 12px;"><i class="fa fa-search"></i> 输入线路搜索线路</span>';
-                },
-                searching: function () {
-                    return '<span style="color:gray;font-size: 12px;"> 正在搜索线路...</span>';
-                }
-            }
-        });
+       	$.get('/basic/lineCode2Name',function(result){
+			var data=[];
+			
+			for(var code in result){
+				data.push({id: code, text: result[code]});
+			}
+			console.log(data);
+			initPinYinSelect2('#xlbm',data,'');
+			
+		})
         $('#nbbm').select2({
             placeholder: '搜索车辆...',
-/** 空间数据 */
-
-var gb_map_spatial_data = (function () {
-
-    var storage = window.localStorage;
-
-    var activeLines = JSON.parse(storage.getItem('lineControlItems'));
-    var line_idx = (function () {
-        var str = '';
-        for (var i = 0, item; item = activeLines[i++];) {
-            str += (',' + item.lineCode);
-        }
-        return str.substr(1);
-    })();
-
-    var cont = '#spatial-tree-content';
-    //线路站点路由数据
-    var lineStationArr;
-
-    //停车场数据
-    var carparkArr;
-
-    var init = function () {
-        //加载站点路由数据
-        gb_common.$get('/realMap/stationSpatialData', {idx: line_idx}, function (rs) {
-            var list = rs.list;
-            $.each(list, function () {
-                this.lat = this.gLaty;
-                this.lon = this.gLonx;
-                delete this.gLaty;
-                delete this.gLonx;
-                if(this.shapesType=='d'){
-                    var calcRs = calcPolygonArea(this.gPolygonGrid);
-                    this._polygonArea = calcRs._polygonArea;
-                    this._gPoints = calcRs._gPoints;
-                }
-            });
-            //排序
-            list.sort(function (a, b) {
-                return a.stationRouteCode - b.stationRouteCode;
-            });
-            //按线路分组
-            lineStationArr = gb_common.groupBy(list, 'lineCode');
-            //再按上下行分组
-            for (var lineCode in lineStationArr) {
-                lineStationArr[lineCode] = gb_common.groupBy(lineStationArr[lineCode], 'directions');
-            }
-
-            ep.emitLater('station');
-        });
-
-        //加载停车场数据
-        gb_common.$get('/realMap/carParkSpatialData', {}, function (rs) {
-            carparkArr = rs.list;
-            $.each(carparkArr, function () {
-                if(this.shapesType=='d'){
-                    var calcRs = calcPolygonArea(this.gParkPoint);
-                    this._polygonArea = calcRs._polygonArea;
-                    this._gPoints = calcRs._gPoints;
-                }
-            });
-            ep.emitLater('carpark');
-        });
-
-        var ep = EventProxy.create('station', 'carpark', function () {
-            $(".real_spatial_panel").resizable({
-                maxHeight: '100%',
-                minHeight: 18
-            });
-
-            //绘制站点路由树
-            $('.station-route-tree', cont)
-            //state插件 状态恢复完成
-                .on('state_ready.jstree', function () {
-                    //绑定checkbox状态切换事件
-                    $(this).on('check_node.jstree uncheck_node.jstree', gb_map_overlay_mge.drawStation);
-                })
-                .on('activate_node.jstree', function (e, n) {
-                    var node = n.node;
-                    if(node.state.checked)
-                        gb_map_overlay_mge._focus_station(node.data);
-                })
-                .jstree({
-                    'core': {
-                        'data': get_st_route_tree_data()
-                    },
-                    'checkbox': {
-                        'keep_selected_style': false,
-                        'whole_node': false,
-                        'tie_selection': false
-                    },
-                    //local storage里的key
-                    'state': {
-                        'key': 'jstree_map_station_route'
-                    },
-                    'plugins': ['checkbox', 'state']
-                });
-
-
-            //停车场
-            $('.carpark-panel', cont)
-                .on('state_ready.jstree', function () {
-                    //绑定checkbox状态切换事件
-                    $(this).on('check_node.jstree uncheck_node.jstree', gb_map_overlay_mge.drawCarpark);
-                })
-                .on('activate_node.jstree', function (e, n) {
-                    var node = n.node;
-                    if(node.state.checked)
-                        gb_map_overlay_mge._focus_carpark(node.data);
-                })
-                .jstree({
-                    'core': {
-                        'data': get_st_carpark_tree_data()
-                    },
-                    'checkbox': {
-                        'keep_selected_style': false,
-                        'whole_node': false,
-                        'tie_selection': false
-                    },
-                    //local storage里的key
-                    'state': {
-                        'key': 'jstree_map_carpark'
-                    },
-                    'plugins': ['checkbox', 'state']
-                });
-
-            refresh();
-        });
-    }
-
-    //计算多边形面积
-    function calcPolygonArea(polygonStr) {
-        var pStr = polygonStr.substring(9, polygonStr.length - 2);
-        var array = pStr.split(',');
-        var newArr=[];
-
-        //递归去掉闭合的尾
-        (function () {
-            var f = arguments.callee;
-            var end=array.length - 1;
-            if(array.length > 1 && array[0] == array[end]){
-                array = array.slice(0, end);
-                f();
-            }
-        })();
-
-        //去掉连续的重复点
-        var last;
-        $.each(array, function (i, str) {
-            if(last){
-                if(last != str)
-                    newArr.push(str);
-            }
-            else
-                newArr.push(str);
-            last = str;
-        });
-
-        var gPoints=[],ts;
-        $.each(newArr, function (i, c) {
-            ts=c.split(' ');
-            gPoints.push({
-                lat: parseFloat(ts[1]),
-                lng: parseFloat(ts[0])
-            });
-        });
-
-        //用百度geo工具库计算面积
-        var _polygonArea = BMapLib.GeoUtils.getPolygonArea(gPoints);
-        return {_polygonArea: _polygonArea.toFixed(2), _gPoints: gPoints};
-    }
-
-    var refresh = function (type, checked) {
-        if (!triggerElem())
-            return;
-
-        if ((type == 'carPark' && checked) || (type == 'station' && !checked)) {
-            //显示停车场面板
-            $('.car-park-item', cont).addClass('uk-active');
-            $('li.cp-tab-btn', '.real_spatial_panel').addClass('uk-active');
-            $('.carpark-panel', cont).jstree(true).check_all();
-
-            //绘制停车场
-            gb_map_overlay_mge.drawCarpark();
-        }
-        else {
-            //显示站点路由面板
-            $('.station-route-item', cont).addClass('uk-active');
-            $('li.sr-tab-btn', '.real_spatial_panel').addClass('uk-active');
-
-            //选中相关站点路由树
-            var chs = gb_map_overlay_mge.getCheckedDevice();
-            var idx = {};
-            $.each(chs, function () {
-                idx[this.data.lineId + '_' + this.data.upDown] = 1;
-            });
-
-            var treeObj = $('.station-route-tree', cont).jstree(true);
-            for (var id in idx) {
-                treeObj.check_node(treeObj.get_node(id + '_st'));
-            }
-
-            //drawStation();
-            gb_map_overlay_mge.drawStation();
-        }
-    }
-
-    var triggerElem = function () {
-        var config = gb_map_config.getConfig().spatialData;
-
-        if(config.station || config.carPark){
-            showPanel();
-            return true;
-        }
-        hidePanel();
-        //gb_map_imap.call('hideAllStationMarker');
-        //gb_map_imap.call('hideDrawCarpark');
-        return false;
-    }
-
-    var animationend = 'webkitAnimationEnd animationend';
-    var showPanel = function () {
-        var elem = $('.real_spatial_panel');
-        var config = gb_map_config.getConfig().spatialData;
-
-        if (config.station && config.carPark) {
-            anim_show($('.uk-subnav', elem), 'uk-animation-scale-up');
-            $('.real_spatial_body', elem).addClass('show-tab');
-        }
-        else {
-            $('.uk-subnav', elem).hide();
-            $('.real_spatial_body', elem).removeClass('show-tab');
-        }
-
-        $('li.uk-active', elem).removeClass('uk-active');
-
-        if (!elem.is(":hidden"))
-            return;
-
-        anim_show(elem, 'uk-animation-slide-left');
-    }
-
-    var hidePanel = function () {
-        var elem = $('.real_spatial_panel');
-        elem.hide();
-    }
-
-    function anim_show(e, anim) {
-        e.addClass(anim).show().one(animationend, function () {
-            $(this).removeClass(anim);
-        });
-    }
-
-    function getCheckedStation() {
-        var list = [];
-        var chs = $('.station-route-tree', cont).jstree(true).get_checked(true);
-        chs = chs.filter(function (item) {
-            return item.data;
-        });
-        $.each(chs, function () {
-            list.push(this.data);
-        });
-        return list;
-    }
-
-    function gteCheckedCarpark() {
-        var list = [];
-        var chs = $('.carpark-panel', cont).jstree(true).get_checked(true);
-        $.each(chs, function () {
-            list.push(this.data);
-        });
-        return list;
-    }
-
-    var get_st_route_tree_data = function () {
-        var treeData = [];
-
-        for (var lineCode in lineStationArr) {
-            name = gb_data_basic.codeToLine[lineCode].name;
-            treeData.push({
-                'text': name,
-                'open': true,
-                'children': [
-                    {
-                        'text': '上行',
-                        'children': grabs(lineStationArr[lineCode][0]),
-                        'id': lineCode + '_0_st'
-                    },
-                    {
-                        'text': '下行',
-                        'children': grabs(lineStationArr[lineCode][1]),
-                        'id': lineCode + '_1_st'
-                    }
-                ]
-            })
-        }
-        return treeData;
-    };
-
-    var get_st_carpark_tree_data = function () {
-        var treeData = [];
-
-        $.each(carparkArr, function () {
-            treeData.push({
-                'text': this.parkName,
-                'data': this
-            });
-        });
-
-        return treeData;
-    }
-
-    var grabs = function (array) {
-        if (!array)
-            return;
-        var rs = [];
-        $.each(array, function () {
-            rs.push({
-                'text': this.stationName,
-                'data': this,
-                'icon': false
-            });
-        });
-        return rs;
-    }
-
-    return {
-        refresh: refresh,
-        init: init,
-        getCheckedStation:getCheckedStation,
-        gteCheckedCarpark: gteCheckedCarpark
-    };
+/** 空间数据 */
+
+var gb_map_spatial_data = (function () {
+
+    var storage = window.localStorage;
+
+    var activeLines = JSON.parse(storage.getItem('lineControlItems'));
+    var line_idx = (function () {
+        var str = '';
+        for (var i = 0, item; item = activeLines[i++];) {
+            str += (',' + item.lineCode);
+        }
+        return str.substr(1);
+    })();
+
+    var cont = '#spatial-tree-content';
+    //线路站点路由数据
+    var lineStationArr;
+
+    //停车场数据
+    var carparkArr;
+
+    var init = function () {
+        //加载站点路由数据
+        gb_common.$get('/realMap/stationSpatialData', {idx: line_idx}, function (rs) {
+            var list = rs.list;
+            $.each(list, function () {
+                this.lat = this.gLaty;
+                this.lon = this.gLonx;
+                delete this.gLaty;
+                delete this.gLonx;
+                if(this.shapesType=='d'){
+                    var calcRs = calcPolygonArea(this.gPolygonGrid);
+                    this._polygonArea = calcRs._polygonArea;
+                    this._gPoints = calcRs._gPoints;
+                }
+            });
+            //排序
+            list.sort(function (a, b) {
+                return a.stationRouteCode - b.stationRouteCode;
+            });
+            //按线路分组
+            lineStationArr = gb_common.groupBy(list, 'lineCode');
+            //再按上下行分组
+            for (var lineCode in lineStationArr) {
+                lineStationArr[lineCode] = gb_common.groupBy(lineStationArr[lineCode], 'directions');
+            }
+
+            ep.emitLater('station');
+        });
+
+        //加载停车场数据
+        gb_common.$get('/realMap/carParkSpatialData', {}, function (rs) {
+            carparkArr = rs.list;
+            $.each(carparkArr, function () {
+                if(this.shapesType=='d'){
+                    var calcRs = calcPolygonArea(this.gParkPoint);
+                    this._polygonArea = calcRs._polygonArea;
+                    this._gPoints = calcRs._gPoints;
+                }
+            });
+            ep.emitLater('carpark');
+        });
+
+        var ep = EventProxy.create('station', 'carpark', function () {
+            $(".real_spatial_panel").resizable({
+                maxHeight: '100%',
+                minHeight: 18
+            });
+
+            //绘制站点路由树
+            $('.station-route-tree', cont)
+            //state插件 状态恢复完成
+                .on('state_ready.jstree', function () {
+                    //绑定checkbox状态切换事件
+                    $(this).on('check_node.jstree uncheck_node.jstree', gb_map_overlay_mge.drawStation);
+                })
+                .on('activate_node.jstree', function (e, n) {
+                    var node = n.node;
+                    if(node.state.checked)
+                        gb_map_overlay_mge._focus_station(node.data);
+                })
+                .jstree({
+                    'core': {
+                        'data': get_st_route_tree_data()
+                    },
+                    'checkbox': {
+                        'keep_selected_style': false,
+                        'whole_node': false,
+                        'tie_selection': false
+                    },
+                    //local storage里的key
+                    'state': {
+                        'key': 'jstree_map_station_route'
+                    },
+                    'plugins': ['checkbox', 'state']
+                });
+
+
+            //停车场
+            $('.carpark-panel', cont)
+                .on('state_ready.jstree', function () {
+                    //绑定checkbox状态切换事件
+                    $(this).on('check_node.jstree uncheck_node.jstree', gb_map_overlay_mge.drawCarpark);
+                })
+                .on('activate_node.jstree', function (e, n) {
+                    var node = n.node;
+                    if(node.state.checked)
+                        gb_map_overlay_mge._focus_carpark(node.data);
+                })
+                .jstree({
+                    'core': {
+                        'data': get_st_carpark_tree_data()
+                    },
+                    'checkbox': {
+                        'keep_selected_style': false,
+                        'whole_node': false,
+                        'tie_selection': false
+                    },
+                    //local storage里的key
+                    'state': {
+                        'key': 'jstree_map_carpark'
+                    },
+                    'plugins': ['checkbox', 'state']
+                });
+
+            refresh();
+        });
+    }
+
+    //计算多边形面积
+    function calcPolygonArea(polygonStr) {
+        var pStr = polygonStr.substring(9, polygonStr.length - 2);
+        var array = pStr.split(',');
+        var newArr=[];
+
+        //递归去掉闭合的尾
+        (function () {
+            var f = arguments.callee;
+            var end=array.length - 1;
+            if(array.length > 1 && array[0] == array[end]){
+                array = array.slice(0, end);
+                f();
+            }
+        })();
+
+        //去掉连续的重复点
+        var last;
+        $.each(array, function (i, str) {
+            if(last){
+                if(last != str)
+                    newArr.push(str);
+            }
+            else
+                newArr.push(str);
+            last = str;
+        });
+
+        var gPoints=[],ts;
+        $.each(newArr, function (i, c) {
+            ts=c.split(' ');
+            gPoints.push({
+                lat: parseFloat(ts[1]),
+                lng: parseFloat(ts[0])
+            });
+        });
+
+        //用百度geo工具库计算面积
+        var _polygonArea = BMapLib.GeoUtils.getPolygonArea(gPoints);
+        return {_polygonArea: _polygonArea.toFixed(2), _gPoints: gPoints};
+    }
+
+    var refresh = function (type, checked) {
+        if (!triggerElem())
+            return;
+
+        if ((type == 'carPark' && checked) || (type == 'station' && !checked)) {
+            //显示停车场面板
+            $('.car-park-item', cont).addClass('uk-active');
+            $('li.cp-tab-btn', '.real_spatial_panel').addClass('uk-active');
+            $('.carpark-panel', cont).jstree(true).check_all();
+
+            //绘制停车场
+            gb_map_overlay_mge.drawCarpark();
+        }
+        else {
+            //显示站点路由面板
+            $('.station-route-item', cont).addClass('uk-active');
+            $('li.sr-tab-btn', '.real_spatial_panel').addClass('uk-active');
+
+            //选中相关站点路由树
+            var chs = gb_map_overlay_mge.getCheckedDevice();
+            var idx = {};
+            $.each(chs, function () {
+                idx[this.data.lineId + '_' + this.data.upDown] = 1;
+            });
+
+            var treeObj = $('.station-route-tree', cont).jstree(true);
+            for (var id in idx) {
+                treeObj.check_node(treeObj.get_node(id + '_st'));
+            }
+
+            //drawStation();
+            gb_map_overlay_mge.drawStation();
+        }
+    }
+
+    var triggerElem = function () {
+        var config = gb_map_config.getConfig().spatialData;
+
+        if(config.station || config.carPark){
+            showPanel();
+            return true;
+        }
+        hidePanel();
+        //gb_map_imap.call('hideAllStationMarker');
+        //gb_map_imap.call('hideDrawCarpark');
+        return false;
+    }
+
+    var animationend = 'webkitAnimationEnd animationend';
+    var showPanel = function () {
+        var elem = $('.real_spatial_panel');
+        var config = gb_map_config.getConfig().spatialData;
+
+        if (config.station && config.carPark) {
+            anim_show($('.uk-subnav', elem), 'uk-animation-scale-up');
+            $('.real_spatial_body', elem).addClass('show-tab');
+        }
+        else {
+            $('.uk-subnav', elem).hide();
+            $('.real_spatial_body', elem).removeClass('show-tab');
+        }
+
+        $('li.uk-active', elem).removeClass('uk-active');
+
+        if (!elem.is(":hidden"))
+            return;
+
+        anim_show(elem, 'uk-animation-slide-left');
+    }
+
+    var hidePanel = function () {
+        var elem = $('.real_spatial_panel');
+        elem.hide();
+    }
+
+    function anim_show(e, anim) {
+        e.addClass(anim).show().one(animationend, function () {
+            $(this).removeClass(anim);
+        });
+    }
+
+    function getCheckedStation() {
+        var list = [];
+        var chs = $('.station-route-tree', cont).jstree(true).get_checked(true);
+        chs = chs.filter(function (item) {
+            return item.data;
+        });
+        $.each(chs, function () {
+            list.push(this.data);
+        });
+        return list;
+    }
+
+    function gteCheckedCarpark() {
+        var list = [];
+        var chs = $('.carpark-panel', cont).jstree(true).get_checked(true);
+        $.each(chs, function () {
+            list.push(this.data);
+        });
+        return list;
+    }
+
+    var get_st_route_tree_data = function () {
+        var treeData = [];
+
+        for (var lineCode in lineStationArr) {
+            name = gb_data_basic.codeToLine[lineCode].name;
+            treeData.push({
+                'text': name,
+                'open': true,
+                'children': [
+                    {
+                        'text': '上行',
+                        'children': grabs(lineStationArr[lineCode][0]),
+                        'id': lineCode + '_0_st'
+                    },
+                    {
+                        'text': '下行',
+                        'children': grabs(lineStationArr[lineCode][1]),
+                        'id': lineCode + '_1_st'
+                    }
+                ]
+            })
+        }
+        return treeData;
+    };
+
+    var get_st_carpark_tree_data = function () {
+        var treeData = [];
+
+        $.each(carparkArr, function () {
+            treeData.push({
+                'text': this.parkName,
+                'data': this
+            });
+        });
+
+        return treeData;
+    }
+
+    var grabs = function (array) {
+        if (!array)
+            return;
+        var rs = [];
+        $.each(array, function () {
+            rs.push({
+                'text': this.stationName,
+                'data': this,
+                'icon': false
+            });
+        });
+        return rs;
+    }
+
+    return {
+        refresh: refresh,
+        init: init,
+        getCheckedStation:getCheckedStation,
+        gteCheckedCarpark: gteCheckedCarpark
+    };
 })();
 \ No newline at end of file