update...

潘钊
1 parent d66d6cf6
Showing 7 changed files with 125 additions and 87 deletions
src/main/java/com/bsth/service/realcontrol/impl/ScheduleRealInfoServiceImpl.java
src/main/resources/fatso/handle_real_ctl.js
src/main/resources/fatso/start.js
src/main/resources/static/real_control_v2/fragments/line_schedule/context_menu/lj_zrw.html
src/main/resources/static/real_control_v2/fragments/line_schedule/context_menu/multi_tzrc.html
src/main/resources/static/real_control_v2/main.html
src/main/resources/static/real_control_v2/mapmonitor/real.html
@@ -400,25 +400,33 @@ public class ScheduleRealInfoServiceImpl extends BaseServiceImpl&lt;ScheduleRealInf
         Map<String, Object> rs = new HashMap<>();
         rs.put("status", ResponseCode.ERROR);
-        ScheduleRealInfo sch = dayOfSchedule.get(id);
-        if (sch == null) {
-            rs.put("msg", "无效的id号");
-            return rs;
-        }
+        try {
+            ScheduleRealInfo sch = dayOfSchedule.get(id);
+            if (sch == null) {
+                rs.put("msg", "无效的id号");
+                return rs;
+            }
-        if (!sch.isSflj()) {
-            rs.put("msg", "你只能删除临加班次");
-            return rs;
-        }
+            if (!sch.isSflj()) {
+                rs.put("msg", "你只能删除临加班次");
+                return rs;
+            }
-        //数据库删除
-        rs = super.delete(id);
-        if(rs.get("status").equals(ResponseCode.SUCCESS)){
-            dayOfSchedule.delete(sch);
-            //更新起点应到时间
-            List<ScheduleRealInfo> ts = dayOfSchedule.updateQdzTimePlan(sch.getClZbh());
-            rs.put("ts", ts);
-            rs.put("delete", sch);
+            //解除和调度指令的外键约束
+            jdbcTemplate.update("update bsth_v_directive_60 set sch=NULL where sch=" + id);
+
+            //数据库删除
+            rs = super.delete(id);
+            if(rs.get("status").equals(ResponseCode.SUCCESS)){
+                dayOfSchedule.delete(sch);
+                //更新起点应到时间
+                List<ScheduleRealInfo> ts = dayOfSchedule.updateQdzTimePlan(sch.getClZbh());
+                rs.put("ts", ts);
+                rs.put("delete", sch);
+            }
+        }catch (Exception e){
+            logger.error("", e);
+            rs.put("msg", e.getMessage());
         }
         return rs;
@@ -2,35 +2,50 @@
  * 处理线调文件
  */
 var fs = require('fs')
-    ,cheerio = require('cheerio')
-    ,minifier = require('./minifier')
-    ,crypto = require("crypto")
-    ,CleanCSS = require('clean-css')
-    ,UglifyJS = require("uglify-js");;
+    , cheerio = require('cheerio')
+    , minifier = require('./minifier')
+    , crypto = require("crypto")
+    , CleanCSS = require('clean-css')
+    , UglifyJS = require("uglify-js");
+;
 //不参与的目录
 var pName = 'bsth_control'
-    ,path = process.cwd()
+    , path = process.cwd()
     //根目录
-    ,root = path.substr(0, path.indexOf('\\src\\main'))
-    ,workspace = root.substr(0, root.indexOf('\\' + pName))
+    , root = path.substr(0, path.indexOf('\\src\\main'))
+    , workspace = root.substr(0, root.indexOf('\\' + pName))
     //临时目录
-    ,dest = (workspace + '\\' + pName+'@fatso_copy').replace(/\//g,'\\')
-    ,_static = '\\src\\main\\resources\\static';
+    , dest = (workspace + '\\' + pName + '@fatso_copy').replace(/\//g, '\\')
+    , _static = '\\src\\main\\resources\\static';
 var mainFile = dest + _static + '\\real_control_v2\\main.html';
+var mapFile = dest + _static + '\\real_control_v2\\mapmonitor\\real.html';
 var realCtl = {
     /**
      * 处理线调首页
      */
-    handleMain: function(cb){
+    handleMain: function (cb) {
         //读取文件
         var data = fs.readFileSync(mainFile, 'utf-8')
-            ,$ = cheerio.load(data);
+            , $ = cheerio.load(data);
         handleCss($, function () {
-            handleJs($, cb);
+            handleJs($, mainFile, cb);
+        });
+    },
+    /**
+     * 处理地图模块
+     * @param cb
+     */
+    handleMap: function (cb) {
+        //读取文件
+        var data = fs.readFileSync(mapFile, 'utf-8')
+            , $ = cheerio.load(data);
+
+        handleCss($, function () {
+            handleJs($, mapFile, cb);
         });
     }
 };
@@ -43,23 +58,23 @@ var handleCss = function ($, cb) {
     var cssArray = $('link[rel=stylesheet][merge]');
     //按 merge 值分组
     var cssMap = {}, mergeName;
-    for(var i = 0, c; c = cssArray[i++];){
+    for (var i = 0, c; c = cssArray[i++];) {
         mergeName = $(c).attr('merge');
-        if(!cssMap[mergeName])
+        if (!cssMap[mergeName])
             cssMap[mergeName] = [];
         cssMap[mergeName].push(dest + _static + $(c).attr('href'));
         //remove
         $(c).remove();
     }
     //按 merge 合并压缩css
-    var ks = get_keys(cssMap), index=0;
+    var ks = get_keys(cssMap), index = 0;
     (function () {
-        if(index >= ks.length){
+        if (index >= ks.length) {
             cb && cb();
             return;
         }
         var k = ks[index];
-        index ++;
+        index++;
         var f = arguments.callee;
         //合并css
         new CleanCSS().minify(cssMap[k], function (error, out) {
@@ -67,10 +82,16 @@ var handleCss = function ($, cb) {
             var fName = (k + '_' + md5(data)) + '.css';
             //写入 assets css 目录下
             var descFile = dest + _static + '\\real_control_v2\\assets\\css\\' + fName;
-            fs.open(descFile, 'a',  function(err, fd){
+            fs.open(descFile, 'a', function (err, fd) {
-                fs.write(fd, data, function(){
-                    $('head').append('<link rel="stylesheet" href="/real_control_v2/assets/css/'+fName+'"/>');
+                fs.write(fd, data, function () {
+                    var tag = '<link rel="stylesheet" href="/real_control_v2/assets/css/' + fName + '"/>';
+                    if ($('head').length > 0)
+                        $('head').append(tag);
+                    else {
+                        //没有head 就将css写在头部
+                        $('div').first().before(tag);
+                    }
                     console.log(k + ' css', '结束，下一个');
                     f();
                 });
@@ -82,13 +103,13 @@ var handleCss = function ($, cb) {
 /**
  * 处理js
  */
-var handleJs = function ($, cb) {
+var handleJs = function ($, file, cb) {
     var scriptArray = $('script[merge]');
     //按 merge 值分组
     var jsMap = {}, mergeName;
-    for(var i = 0, s; s = scriptArray[i++];){
+    for (var i = 0, s; s = scriptArray[i++];) {
         mergeName = $(s).attr('merge');
-        if(!jsMap[mergeName])
+        if (!jsMap[mergeName])
             jsMap[mergeName] = [];
         jsMap[mergeName].push(dest + _static + $(s).attr('src'));
         //remove
@@ -96,16 +117,16 @@ var handleJs = function ($, cb) {
     }
     //按 merge 合并压缩js
-    var ks = get_keys(jsMap), index=0;
+    var ks = get_keys(jsMap), index = 0;
     (function () {
-        if(index >= ks.length){
-            write(mainFile, $.html());
-            console.log('线调处理结束'.green);
+        if (index >= ks.length) {
+            write(file, $.html());
+            console.log(file + ' 结束'.green);
             cb && cb();
             return;
         }
         var k = ks[index];
-        index ++;
+        index++;
         var f = arguments.callee;
         //合并压缩js
         var result = UglifyJS.minify(jsMap[k]);
@@ -113,10 +134,16 @@ var handleJs = function ($, cb) {
         var fName = (k + '_' + md5(data)) + '.js';
         //写入 assets js 目录下
         var descFile = dest + _static + '\\real_control_v2\\assets\\js\\' + fName;
-        fs.open(descFile, 'a',  function(err, fd){
+        fs.open(descFile, 'a', function (err, fd) {
-            fs.write(fd, data, function(){
-                $('body').append('<script src="/real_control_v2/assets/js/'+fName+'"></script>');
+            fs.write(fd, data, function () {
+                var tag = '<script src="/real_control_v2/assets/js/' + fName + '"></script>';
+                if ($('body').length > 0)
+                    $('body').append(tag);
+                else {
+                    //没有body 就写在尾部
+                    $('*').last().after(tag);
+                }
                 console.log(k + ' js', '结束，下一个');
                 f();
             });
@@ -132,13 +159,13 @@ var get_keys = function (json) {
     return array;
 };
-function md5(text){
+function md5(text) {
     return crypto.createHash("md5").update(text).digest("hex");
 }
-function write(file, text){
+function write(file, text) {
     fs.writeFile(file, text, function (err) {
-        if (err){
+        if (err) {
             console.log(err.toString().red);
             process.exit();
         }
@@ -83,9 +83,12 @@ ep.tail(&#39;minifier-js&#39;, function(){
 			ep.emit('handle-fragment', item);
 		},
 		function(){
-			//处理线调
+			//处理线调首页
 			handle_real_ctl.handleMain(function () {
-				ep.emit('package-jar');
+				//处理线调地图
+				handle_real_ctl.handleMap(function () {
+					ep.emit('package-jar');
+				});
 			});
 		});
 	});
@@ -295,7 +295,7 @@
                 var sch = getActiveSch();
                 if (!sch || !sch.sflj)
                     return notify_err('只能删除临加班次！');
-                var str = '<h3>确定要删除临加班次<span style="color:red;margin: 0 5px;">' + sch.clZbh + '( ' + sch.dfsj + ' )</span>?</h3>';
+                var str = '<h3>确定要删除临加班次<span style="color:red;margin: 0 5px;">' + sch.clZbh + '( ' + sch.dfsj + ' )</span>?</h3><h5 style="color: #6c6c6c;font-size: 12px;">如果删除失败，可能正处于调度指令下行上达瞬间，等几秒再删即可。班次删除后，调度指令会保留</h5>';
                 alt_confirm(str, function () {
                     gb_common.$del('/realSchedule/' + sch.id, function (rs) {
                         //前端数据更新
-<div class="uk-modal ct_move_modal" id="schedule-multi-tzrc-modal">
+<div class="uk-modal" id="schedule-multi-tzrc-modal">
     <div class="drag-container"></div>
     <div class="uk-modal-dialog" style="width: 860px;">
         <a href="" class="uk-modal-close uk-close"></a>
@@ -25,14 +25,14 @@
     <!-- custom table -->
     <link rel="stylesheet" href="/real_control_v2/css/ct_table.css" merge="custom_style"/>
     <!-- jquery contextMenu style -->
-    <link rel="stylesheet" href="/real_control_v2/assets/css/jquery.contextMenu.min.css" />
+    <link rel="stylesheet" href="/real_control_v2/assets/css/jquery.contextMenu.min.css"  merge="plugins"/>
     <!-- formvalidation style -->
-    <link rel="stylesheet" href="/real_control_v2/assets/plugins/formvalidation/formValidation.min.css"/>
+    <link rel="stylesheet" href="/real_control_v2/assets/plugins/formvalidation/formValidation.min.css"  merge="plugins"/>
     <!-- js tree -->
-    <link rel="stylesheet" href="/real_control_v2/assets/plugins/jstree/default/style.min.css"/>
+    <link rel="stylesheet" href="/real_control_v2/assets/plugins/jstree/default/style.min.css"  merge="plugins"/>
     <!-- tooltip css-->
-    <link rel="stylesheet" href="/real_control_v2/assets/plugins/qtip/jquery.qtip.min.css"/>
-    <link rel="stylesheet" href="/real_control_v2/css/pace.css" merge="custom_style"/>
+    <link rel="stylesheet" href="/real_control_v2/assets/plugins/qtip/jquery.qtip.min.css"  merge="plugins"/>
+    <link rel="stylesheet" href="/real_control_v2/css/pace.css"  merge="plugins"/>
     <link rel="stylesheet" href="/real_control_v2/css/modal_extend.css" merge="custom_style"/>
 </head>
@@ -93,8 +93,8 @@
 <!-- 地图相关 -->
 <script src="http://api.map.baidu.com/api?v=2.0&ak=IGGrr4UjwIYzatoCRFKEL8sT"></script>
 <script src="http://api.map.baidu.com/library/TrafficControl/1.4/src/TrafficControl_min.js"></script>
-<script src="/assets/js/baidu//MarkerClusterer.js"></script>
-<script src="/assets/js/TransGPS.js"></script>
+<script src="/assets/js/baidu//MarkerClusterer.js" merge="plugins"></script>
+<script src="/assets/js/TransGPS.js" merge="plugins"></script>
 <!-- 高德  -->
 <script src="http://webapi.amap.com/maps?v=1.3&key=16cb1c5043847e09ef9edafdd77befda"></script>
 <!-- jquery -->
@@ -108,7 +108,7 @@
 <!-- common js -->
 <script src="/real_control_v2/js/common.js"></script>
 <!-- art-template 模版引擎 -->
-<script src="/assets/plugins/template.js"></script>
+<script src="/assets/plugins/template.js" merge="plugins"></script>
 <!-- d3 -->
 <script src="/assets/js/d3.min.js"></script>
 <!-- EventProxy  -->
@@ -135,7 +135,7 @@
 <!-- js tree -->
 <script src="/real_control_v2/assets/plugins/jstree/jstree.min.js"  merge="plugins"></script>
 <!-- simple pinyin -->
-<script src="/assets/plugins/pinyin.js"></script>
+<script src="/assets/plugins/pinyin.js" merge="plugins"></script>
 <!-- qtip -->
 <script src="/real_control_v2/assets/plugins/qtip/jquery.qtip.min.js" merge="plugins"></script>
@@ -175,9 +175,9 @@
 <script src="/real_control_v2/js/utils/tts.js" merge="custom_js"></script>
 <!-- echart -->
-<script src="/real_control_v2/assets/echarts-3/echarts.js"></script>
+<script src="/real_control_v2/assets/echarts-3/echarts.js" merge="plugins"></script>
 <!-- Geolib -->
-<script src="/real_control_v2/geolib/geolib.js"></script>
+<script src="/real_control_v2/geolib/geolib.js" merge="plugins"></script>
 <script src="/real_control_v2/js/signal_state/signal_state.js" merge="custom_js"></script>
 <script src="/real_control_v2/js/utils/dispatch_pattern.js" merge="custom_js"></script>
-<link href="/assets/css/TrafficControl.css" rel="stylesheet"/>
-<link rel="stylesheet" href="/real_control_v2/assets/plugins/jquery.ui/themes/base/all.css"/>
-<link rel="stylesheet" href="/real_control_v2/assets/plugins/spectrum/spectrum.css"/>
-<link rel="stylesheet" href="/real_control_v2/assets/plugins/uikit-2.27.1/components/form-advanced.gradient.min.css"/>
+<link href="/assets/css/TrafficControl.css" rel="stylesheet" merge="map_plugins"/>
+<link rel="stylesheet" href="/real_control_v2/assets/plugins/jquery.ui/themes/base/all.css" merge="map_plugins"/>
+<link rel="stylesheet" href="/real_control_v2/assets/plugins/spectrum/spectrum.css" merge="map_plugins"/>
+<link rel="stylesheet" href="/real_control_v2/assets/plugins/uikit-2.27.1/components/form-advanced.gradient.min.css" merge="map_plugins"/>
 <link rel="stylesheet" href="/real_control_v2/mapmonitor/css/real.css"/>
-<link rel="stylesheet" href="/real_control_v2/assets/plugins/uikit-2.27.1/components/progress.gradient.min.css">
+<link rel="stylesheet" href="/real_control_v2/assets/plugins/uikit-2.27.1/components/progress.gradient.min.css" merge="map_plugins">
 <div class="map-system-msg flex-left">
     <a class="z-depth-2" href="/pages/mapmonitor/alone/wrap.html" target="_blank"></a>
@@ -50,21 +50,21 @@
     </div>
 </div>
-<script src="/real_control_v2/assets/js/GeoUtils_min.js"></script>
-<script src="/real_control_v2/mapmonitor/js/config.js" merge="custom_map_js"></script>
-<script src="/real_control_v2/mapmonitor/js/gps_tree.js" merge="custom_map_js"></script>
-<script src="/real_control_v2/mapmonitor/js/spatial_data.js" merge="custom_map_js"></script>
-<script src="/real_control_v2/mapmonitor/js/map_overlay_manager.js" merge="custom_map_js"></script>
-<script src="/real_control_v2/mapmonitor/js/real.js" merge="custom_map_js"></script>
-<script src="/real_control_v2/mapmonitor/js/map/iMap.js" merge="custom_map_js"></script>
-<script src="/real_control_v2/mapmonitor/js/map/platform/baidu.js" merge="custom_map_js"></script>
-<script src="/real_control_v2/mapmonitor/js/map/platform/gaode.js" merge="custom_map_js"></script>
+<script src="/real_control_v2/assets/js/GeoUtils_min.js" merge="map_plugins"></script>
+<script src="/real_control_v2/mapmonitor/js/config.js" merge="map_custom_js"></script>
+<script src="/real_control_v2/mapmonitor/js/gps_tree.js" merge="map_custom_js"></script>
+<script src="/real_control_v2/mapmonitor/js/spatial_data.js" merge="map_custom_js"></script>
+<script src="/real_control_v2/mapmonitor/js/map_overlay_manager.js" merge="map_custom_js"></script>
+<script src="/real_control_v2/mapmonitor/js/real.js" ></script>
+<script src="/real_control_v2/mapmonitor/js/map/iMap.js" merge="map_custom_js"></script>
+<script src="/real_control_v2/mapmonitor/js/map/platform/baidu.js" merge="map_custom_js"></script>
+<script src="/real_control_v2/mapmonitor/js/map/platform/gaode.js" merge="map_custom_js"></script>
 <!-- jquery ui -->
-<script src="/real_control_v2/assets/plugins/jquery.ui/core.js"></script>
-<script src="/real_control_v2/assets/plugins/jquery.ui/widget.js"></script>
-<script src="/real_control_v2/assets/plugins/jquery.ui/mouse.js"></script>
-<script src="/real_control_v2/assets/plugins/jquery.ui/resizable.js"></script>
+<script src="/real_control_v2/assets/plugins/jquery.ui/core.js"  merge="map_plugins"></script>
+<script src="/real_control_v2/assets/plugins/jquery.ui/widget.js"  merge="map_plugins"></script>
+<script src="/real_control_v2/assets/plugins/jquery.ui/mouse.js"  merge="map_plugins"></script>
+<script src="/real_control_v2/assets/plugins/jquery.ui/resizable.js"  merge="map_plugins"></script>
 <!-- 颜色选择器 -->
-<script src="/real_control_v2/assets/plugins/spectrum/spectrum.js"></script>
+<script src="/real_control_v2/assets/plugins/spectrum/spectrum.js"  merge="map_plugins"></script>
 <!-- play back -->
-<script src="/real_control_v2/mapmonitor/js/playback.js" merge="custom_map_js"></script>
 \ No newline at end of file
+<script src="/real_control_v2/mapmonitor/js/playback.js" merge="map_custom_js"></script>
 \ No newline at end of file