潘钊 / bsth_control · Commits

Commit c41da1008d7ed7ccd39daf82c0096302a9d79e53

Authored by 潘钊
1 parent d66d6cf6

update...

Inline Side-by-side
Showing 7 changed files with 125 additions and 87 deletions
src/main/java/com/bsth/service/realcontrol/impl/ScheduleRealInfoServiceImpl.java
  View file @c41da10
... ... @@ -400,25 +400,33 @@ public class ScheduleRealInfoServiceImpl extends BaseServiceImpl<ScheduleRealInf
400 400 Map<String, Object> rs = new HashMap<>();
401 401 rs.put("status", ResponseCode.ERROR);
402 402  
403   - ScheduleRealInfo sch = dayOfSchedule.get(id);
404   - if (sch == null) {
405   - rs.put("msg", "无效的id号");
406   - return rs;
407   - }
  403 + try {
  404 + ScheduleRealInfo sch = dayOfSchedule.get(id);
  405 + if (sch == null) {
  406 + rs.put("msg", "无效的id号");
  407 + return rs;
  408 + }
408 409  
409   - if (!sch.isSflj()) {
410   - rs.put("msg", "你只能删除临加班次");
411   - return rs;
412   - }
  410 + if (!sch.isSflj()) {
  411 + rs.put("msg", "你只能删除临加班次");
  412 + return rs;
  413 + }
413 414  
414   - //数据库删除
415   - rs = super.delete(id);
416   - if(rs.get("status").equals(ResponseCode.SUCCESS)){
417   - dayOfSchedule.delete(sch);
418   - //更新起点应到时间
419   - List<ScheduleRealInfo> ts = dayOfSchedule.updateQdzTimePlan(sch.getClZbh());
420   - rs.put("ts", ts);
421   - rs.put("delete", sch);
  415 + //解除和调度指令的外键约束
  416 + jdbcTemplate.update("update bsth_v_directive_60 set sch=NULL where sch=" + id);
  417 +
  418 + //数据库删除
  419 + rs = super.delete(id);
  420 + if(rs.get("status").equals(ResponseCode.SUCCESS)){
  421 + dayOfSchedule.delete(sch);
  422 + //更新起点应到时间
  423 + List<ScheduleRealInfo> ts = dayOfSchedule.updateQdzTimePlan(sch.getClZbh());
  424 + rs.put("ts", ts);
  425 + rs.put("delete", sch);
  426 + }
  427 + }catch (Exception e){
  428 + logger.error("", e);
  429 + rs.put("msg", e.getMessage());
422 430 }
423 431  
424 432 return rs;
... ...
src/main/resources/fatso/handle_real_ctl.js
  View file @c41da10
... ... @@ -2,35 +2,50 @@
2 2 * 处理线调文件
3 3 */
4 4 var fs = require('fs')
5   - ,cheerio = require('cheerio')
6   - ,minifier = require('./minifier')
7   - ,crypto = require("crypto")
8   - ,CleanCSS = require('clean-css')
9   - ,UglifyJS = require("uglify-js");;
  5 + , cheerio = require('cheerio')
  6 + , minifier = require('./minifier')
  7 + , crypto = require("crypto")
  8 + , CleanCSS = require('clean-css')
  9 + , UglifyJS = require("uglify-js");
  10 +;
10 11  
11 12 //不参与的目录
12 13 var pName = 'bsth_control'
13   - ,path = process.cwd()
  14 + , path = process.cwd()
14 15 //根目录
15   - ,root = path.substr(0, path.indexOf('\\src\\main'))
16   - ,workspace = root.substr(0, root.indexOf('\\' + pName))
  16 + , root = path.substr(0, path.indexOf('\\src\\main'))
  17 + , workspace = root.substr(0, root.indexOf('\\' + pName))
17 18 //临时目录
18   - ,dest = (workspace + '\\' + pName+'@fatso_copy').replace(/\//g,'\\')
19   - ,_static = '\\src\\main\\resources\\static';
  19 + , dest = (workspace + '\\' + pName + '@fatso_copy').replace(/\//g, '\\')
  20 + , _static = '\\src\\main\\resources\\static';
20 21  
21 22  
22 23 var mainFile = dest + _static + '\\real_control_v2\\main.html';
  24 +var mapFile = dest + _static + '\\real_control_v2\\mapmonitor\\real.html';
23 25 var realCtl = {
24 26 /**
25 27 * 处理线调首页
26 28 */
27   - handleMain: function(cb){
  29 + handleMain: function (cb) {
28 30 //读取文件
29 31 var data = fs.readFileSync(mainFile, 'utf-8')
30   - ,$ = cheerio.load(data);
  32 + , $ = cheerio.load(data);
31 33  
32 34 handleCss($, function () {
33   - handleJs($, cb);
  35 + handleJs($, mainFile, cb);
  36 + });
  37 + },
  38 + /**
  39 + * 处理地图模块
  40 + * @param cb
  41 + */
  42 + handleMap: function (cb) {
  43 + //读取文件
  44 + var data = fs.readFileSync(mapFile, 'utf-8')
  45 + , $ = cheerio.load(data);
  46 +
  47 + handleCss($, function () {
  48 + handleJs($, mapFile, cb);
34 49 });
35 50 }
36 51 };
... ... @@ -43,23 +58,23 @@ var handleCss = function ($, cb) {
43 58 var cssArray = $('link[rel=stylesheet][merge]');
44 59 //按 merge 值分组
45 60 var cssMap = {}, mergeName;
46   - for(var i = 0, c; c = cssArray[i++];){
  61 + for (var i = 0, c; c = cssArray[i++];) {
47 62 mergeName = $(c).attr('merge');
48   - if(!cssMap[mergeName])
  63 + if (!cssMap[mergeName])
49 64 cssMap[mergeName] = [];
50 65 cssMap[mergeName].push(dest + _static + $(c).attr('href'));
51 66 //remove
52 67 $(c).remove();
53 68 }
54 69 //按 merge 合并压缩css
55   - var ks = get_keys(cssMap), index=0;
  70 + var ks = get_keys(cssMap), index = 0;
56 71 (function () {
57   - if(index >= ks.length){
  72 + if (index >= ks.length) {
58 73 cb && cb();
59 74 return;
60 75 }
61 76 var k = ks[index];
62   - index ++;
  77 + index++;
63 78 var f = arguments.callee;
64 79 //合并css
65 80 new CleanCSS().minify(cssMap[k], function (error, out) {
... ... @@ -67,10 +82,16 @@ var handleCss = function ($, cb) {
67 82 var fName = (k + '_' + md5(data)) + '.css';
68 83 //写入 assets css 目录下
69 84 var descFile = dest + _static + '\\real_control_v2\\assets\\css\\' + fName;
70   - fs.open(descFile, 'a', function(err, fd){
  85 + fs.open(descFile, 'a', function (err, fd) {
71 86  
72   - fs.write(fd, data, function(){
73   - $('head').append('<link rel="stylesheet" href="/real_control_v2/assets/css/'+fName+'"/>');
  87 + fs.write(fd, data, function () {
  88 + var tag = '<link rel="stylesheet" href="/real_control_v2/assets/css/' + fName + '"/>';
  89 + if ($('head').length > 0)
  90 + $('head').append(tag);
  91 + else {
  92 + //没有head 就将css写在头部
  93 + $('div').first().before(tag);
  94 + }
74 95 console.log(k + ' css', '结束，下一个');
75 96 f();
76 97 });
... ... @@ -82,13 +103,13 @@ var handleCss = function ($, cb) {
82 103 /**
83 104 * 处理js
84 105 */
85   -var handleJs = function ($, cb) {
  106 +var handleJs = function ($, file, cb) {
86 107 var scriptArray = $('script[merge]');
87 108 //按 merge 值分组
88 109 var jsMap = {}, mergeName;
89   - for(var i = 0, s; s = scriptArray[i++];){
  110 + for (var i = 0, s; s = scriptArray[i++];) {
90 111 mergeName = $(s).attr('merge');
91   - if(!jsMap[mergeName])
  112 + if (!jsMap[mergeName])
92 113 jsMap[mergeName] = [];
93 114 jsMap[mergeName].push(dest + _static + $(s).attr('src'));
94 115 //remove
... ... @@ -96,16 +117,16 @@ var handleJs = function ($, cb) {
96 117 }
97 118  
98 119 //按 merge 合并压缩js
99   - var ks = get_keys(jsMap), index=0;
  120 + var ks = get_keys(jsMap), index = 0;
100 121 (function () {
101   - if(index >= ks.length){
102   - write(mainFile, $.html());
103   - console.log('线调处理结束'.green);
  122 + if (index >= ks.length) {
  123 + write(file, $.html());
  124 + console.log(file + ' 结束'.green);
104 125 cb && cb();
105 126 return;
106 127 }
107 128 var k = ks[index];
108   - index ++;
  129 + index++;
109 130 var f = arguments.callee;
110 131 //合并压缩js
111 132 var result = UglifyJS.minify(jsMap[k]);
... ... @@ -113,10 +134,16 @@ var handleJs = function ($, cb) {
113 134 var fName = (k + '_' + md5(data)) + '.js';
114 135 //写入 assets js 目录下
115 136 var descFile = dest + _static + '\\real_control_v2\\assets\\js\\' + fName;
116   - fs.open(descFile, 'a', function(err, fd){
  137 + fs.open(descFile, 'a', function (err, fd) {
117 138  
118   - fs.write(fd, data, function(){
119   - $('body').append('<script src="/real_control_v2/assets/js/'+fName+'"></script>');
  139 + fs.write(fd, data, function () {
  140 + var tag = '<script src="/real_control_v2/assets/js/' + fName + '"></script>';
  141 + if ($('body').length > 0)
  142 + $('body').append(tag);
  143 + else {
  144 + //没有body 就写在尾部
  145 + $('*').last().after(tag);
  146 + }
120 147 console.log(k + ' js', '结束，下一个');
121 148 f();
122 149 });
... ... @@ -132,13 +159,13 @@ var get_keys = function (json) {
132 159 return array;
133 160 };
134 161  
135   -function md5(text){
  162 +function md5(text) {
136 163 return crypto.createHash("md5").update(text).digest("hex");
137 164 }
138 165  
139   -function write(file, text){
  166 +function write(file, text) {
140 167 fs.writeFile(file, text, function (err) {
141   - if (err){
  168 + if (err) {
142 169 console.log(err.toString().red);
143 170 process.exit();
144 171 }
... ...
src/main/resources/fatso/start.js
  View file @c41da10
... ... @@ -83,9 +83,12 @@ ep.tail(&#39;minifier-js&#39;, function(){
83 83 ep.emit('handle-fragment', item);
84 84 },
85 85 function(){
86   - //处理线调
  86 + //处理线调首页
87 87 handle_real_ctl.handleMain(function () {
88   - ep.emit('package-jar');
  88 + //处理线调地图
  89 + handle_real_ctl.handleMap(function () {
  90 + ep.emit('package-jar');
  91 + });
89 92 });
90 93 });
91 94 });
... ...
src/main/resources/static/real_control_v2/fragments/line_schedule/context_menu/lj_zrw.html
  View file @c41da10
... ... @@ -295,7 +295,7 @@
295 295 var sch = getActiveSch();
296 296 if (!sch || !sch.sflj)
297 297 return notify_err('只能删除临加班次！');
298   - var str = '<h3>确定要删除临加班次<span style="color:red;margin: 0 5px;">' + sch.clZbh + '( ' + sch.dfsj + ' )</span>?</h3>';
  298 + var str = '<h3>确定要删除临加班次<span style="color:red;margin: 0 5px;">' + sch.clZbh + '( ' + sch.dfsj + ' )</span>?</h3><h5 style="color: #6c6c6c;font-size: 12px;">如果删除失败，可能正处于调度指令下行上达瞬间，等几秒再删即可。班次删除后，调度指令会保留</h5>';
299 299 alt_confirm(str, function () {
300 300 gb_common.$del('/realSchedule/' + sch.id, function (rs) {
301 301 //前端数据更新
... ...
src/main/resources/static/real_control_v2/fragments/line_schedule/context_menu/multi_tzrc.html
  View file @c41da10
1   -<div class="uk-modal ct_move_modal" id="schedule-multi-tzrc-modal">
  1 +<div class="uk-modal" id="schedule-multi-tzrc-modal">
2 2 <div class="drag-container"></div>
3 3 <div class="uk-modal-dialog" style="width: 860px;">
4 4 <a href="" class="uk-modal-close uk-close"></a>
... ...
src/main/resources/static/real_control_v2/main.html
  View file @c41da10
... ... @@ -25,14 +25,14 @@
25 25 <!-- custom table -->
26 26 <link rel="stylesheet" href="/real_control_v2/css/ct_table.css" merge="custom_style"/>
27 27 <!-- jquery contextMenu style -->
28   - <link rel="stylesheet" href="/real_control_v2/assets/css/jquery.contextMenu.min.css" />
  28 + <link rel="stylesheet" href="/real_control_v2/assets/css/jquery.contextMenu.min.css" merge="plugins"/>
29 29 <!-- formvalidation style -->
30   - <link rel="stylesheet" href="/real_control_v2/assets/plugins/formvalidation/formValidation.min.css"/>
  30 + <link rel="stylesheet" href="/real_control_v2/assets/plugins/formvalidation/formValidation.min.css" merge="plugins"/>
31 31 <!-- js tree -->
32   - <link rel="stylesheet" href="/real_control_v2/assets/plugins/jstree/default/style.min.css"/>
  32 + <link rel="stylesheet" href="/real_control_v2/assets/plugins/jstree/default/style.min.css" merge="plugins"/>
33 33 <!-- tooltip css-->
34   - <link rel="stylesheet" href="/real_control_v2/assets/plugins/qtip/jquery.qtip.min.css"/>
35   - <link rel="stylesheet" href="/real_control_v2/css/pace.css" merge="custom_style"/>
  34 + <link rel="stylesheet" href="/real_control_v2/assets/plugins/qtip/jquery.qtip.min.css" merge="plugins"/>
  35 + <link rel="stylesheet" href="/real_control_v2/css/pace.css" merge="plugins"/>
36 36  
37 37 <link rel="stylesheet" href="/real_control_v2/css/modal_extend.css" merge="custom_style"/>
38 38 </head>
... ... @@ -93,8 +93,8 @@
93 93 <!-- 地图相关 -->
94 94 <script src="http://api.map.baidu.com/api?v=2.0&ak=IGGrr4UjwIYzatoCRFKEL8sT"></script>
95 95 <script src="http://api.map.baidu.com/library/TrafficControl/1.4/src/TrafficControl_min.js"></script>
96   -<script src="/assets/js/baidu//MarkerClusterer.js"></script>
97   -<script src="/assets/js/TransGPS.js"></script>
  96 +<script src="/assets/js/baidu//MarkerClusterer.js" merge="plugins"></script>
  97 +<script src="/assets/js/TransGPS.js" merge="plugins"></script>
98 98 <!-- 高德 -->
99 99 <script src="http://webapi.amap.com/maps?v=1.3&key=16cb1c5043847e09ef9edafdd77befda"></script>
100 100 <!-- jquery -->
... ... @@ -108,7 +108,7 @@
108 108 <!-- common js -->
109 109 <script src="/real_control_v2/js/common.js"></script>
110 110 <!-- art-template 模版引擎 -->
111   -<script src="/assets/plugins/template.js"></script>
  111 +<script src="/assets/plugins/template.js" merge="plugins"></script>
112 112 <!-- d3 -->
113 113 <script src="/assets/js/d3.min.js"></script>
114 114 <!-- EventProxy -->
... ... @@ -135,7 +135,7 @@
135 135 <!-- js tree -->
136 136 <script src="/real_control_v2/assets/plugins/jstree/jstree.min.js" merge="plugins"></script>
137 137 <!-- simple pinyin -->
138   -<script src="/assets/plugins/pinyin.js"></script>
  138 +<script src="/assets/plugins/pinyin.js" merge="plugins"></script>
139 139 <!-- qtip -->
140 140 <script src="/real_control_v2/assets/plugins/qtip/jquery.qtip.min.js" merge="plugins"></script>
141 141  
... ... @@ -175,9 +175,9 @@
175 175 <script src="/real_control_v2/js/utils/tts.js" merge="custom_js"></script>
176 176  
177 177 <!-- echart -->
178   -<script src="/real_control_v2/assets/echarts-3/echarts.js"></script>
  178 +<script src="/real_control_v2/assets/echarts-3/echarts.js" merge="plugins"></script>
179 179 <!-- Geolib -->
180   -<script src="/real_control_v2/geolib/geolib.js"></script>
  180 +<script src="/real_control_v2/geolib/geolib.js" merge="plugins"></script>
181 181  
182 182 <script src="/real_control_v2/js/signal_state/signal_state.js" merge="custom_js"></script>
183 183 <script src="/real_control_v2/js/utils/dispatch_pattern.js" merge="custom_js"></script>
... ...
src/main/resources/static/real_control_v2/mapmonitor/real.html
  View file @c41da10
1   -<link href="/assets/css/TrafficControl.css" rel="stylesheet"/>
2   -<link rel="stylesheet" href="/real_control_v2/assets/plugins/jquery.ui/themes/base/all.css"/>
3   -<link rel="stylesheet" href="/real_control_v2/assets/plugins/spectrum/spectrum.css"/>
4   -<link rel="stylesheet" href="/real_control_v2/assets/plugins/uikit-2.27.1/components/form-advanced.gradient.min.css"/>
  1 +<link href="/assets/css/TrafficControl.css" rel="stylesheet" merge="map_plugins"/>
  2 +<link rel="stylesheet" href="/real_control_v2/assets/plugins/jquery.ui/themes/base/all.css" merge="map_plugins"/>
  3 +<link rel="stylesheet" href="/real_control_v2/assets/plugins/spectrum/spectrum.css" merge="map_plugins"/>
  4 +<link rel="stylesheet" href="/real_control_v2/assets/plugins/uikit-2.27.1/components/form-advanced.gradient.min.css" merge="map_plugins"/>
5 5 <link rel="stylesheet" href="/real_control_v2/mapmonitor/css/real.css"/>
6   -<link rel="stylesheet" href="/real_control_v2/assets/plugins/uikit-2.27.1/components/progress.gradient.min.css">
  6 +<link rel="stylesheet" href="/real_control_v2/assets/plugins/uikit-2.27.1/components/progress.gradient.min.css" merge="map_plugins">
7 7  
8 8 <div class="map-system-msg flex-left">
9 9 <a class="z-depth-2" href="/pages/mapmonitor/alone/wrap.html" target="_blank"></a>
... ... @@ -50,21 +50,21 @@
50 50 </div>
51 51 </div>
52 52  
53   -<script src="/real_control_v2/assets/js/GeoUtils_min.js"></script>
54   -<script src="/real_control_v2/mapmonitor/js/config.js" merge="custom_map_js"></script>
55   -<script src="/real_control_v2/mapmonitor/js/gps_tree.js" merge="custom_map_js"></script>
56   -<script src="/real_control_v2/mapmonitor/js/spatial_data.js" merge="custom_map_js"></script>
57   -<script src="/real_control_v2/mapmonitor/js/map_overlay_manager.js" merge="custom_map_js"></script>
58   -<script src="/real_control_v2/mapmonitor/js/real.js" merge="custom_map_js"></script>
59   -<script src="/real_control_v2/mapmonitor/js/map/iMap.js" merge="custom_map_js"></script>
60   -<script src="/real_control_v2/mapmonitor/js/map/platform/baidu.js" merge="custom_map_js"></script>
61   -<script src="/real_control_v2/mapmonitor/js/map/platform/gaode.js" merge="custom_map_js"></script>
  53 +<script src="/real_control_v2/assets/js/GeoUtils_min.js" merge="map_plugins"></script>
  54 +<script src="/real_control_v2/mapmonitor/js/config.js" merge="map_custom_js"></script>
  55 +<script src="/real_control_v2/mapmonitor/js/gps_tree.js" merge="map_custom_js"></script>
  56 +<script src="/real_control_v2/mapmonitor/js/spatial_data.js" merge="map_custom_js"></script>
  57 +<script src="/real_control_v2/mapmonitor/js/map_overlay_manager.js" merge="map_custom_js"></script>
  58 +<script src="/real_control_v2/mapmonitor/js/real.js" ></script>
  59 +<script src="/real_control_v2/mapmonitor/js/map/iMap.js" merge="map_custom_js"></script>
  60 +<script src="/real_control_v2/mapmonitor/js/map/platform/baidu.js" merge="map_custom_js"></script>
  61 +<script src="/real_control_v2/mapmonitor/js/map/platform/gaode.js" merge="map_custom_js"></script>
62 62 <!-- jquery ui -->
63   -<script src="/real_control_v2/assets/plugins/jquery.ui/core.js"></script>
64   -<script src="/real_control_v2/assets/plugins/jquery.ui/widget.js"></script>
65   -<script src="/real_control_v2/assets/plugins/jquery.ui/mouse.js"></script>
66   -<script src="/real_control_v2/assets/plugins/jquery.ui/resizable.js"></script>
  63 +<script src="/real_control_v2/assets/plugins/jquery.ui/core.js" merge="map_plugins"></script>
  64 +<script src="/real_control_v2/assets/plugins/jquery.ui/widget.js" merge="map_plugins"></script>
  65 +<script src="/real_control_v2/assets/plugins/jquery.ui/mouse.js" merge="map_plugins"></script>
  66 +<script src="/real_control_v2/assets/plugins/jquery.ui/resizable.js" merge="map_plugins"></script>
67 67 <!-- 颜色选择器 -->
68   -<script src="/real_control_v2/assets/plugins/spectrum/spectrum.js"></script>
  68 +<script src="/real_control_v2/assets/plugins/spectrum/spectrum.js" merge="map_plugins"></script>
69 69 <!-- play back -->
70   -<script src="/real_control_v2/mapmonitor/js/playback.js" merge="custom_map_js"></script>
71 70 \ No newline at end of file
  71 +<script src="/real_control_v2/mapmonitor/js/playback.js" merge="map_custom_js"></script>
72 72 \ No newline at end of file
... ...