Merge branch 'minhang' of

http://222.66.0.204:8090/panzhaov5/bsth_control into minhang

Merge branch 'minhang' of
http://222.66.0.204:8090/panzhaov5/bsth_control into minhang
廖磊
2 parents 6040ea55 d4c7e947
Showing 13 changed files with 322 additions and 31 deletions
src/main/java/com/bsth/controller/realcontrol/anomalyCheckController.java
src/main/java/com/bsth/controller/sys/UserController.java
src/main/java/com/bsth/data/schedule/DayOfSchedule.java
src/main/java/com/bsth/service/sys/SysUserService.java
src/main/java/com/bsth/service/sys/impl/SysUserServiceImpl.java
src/main/resources/fatso/handle_real_ctl.js
src/main/resources/fatso/package.json
src/main/resources/fatso/parse.js
src/main/resources/fatso/start.js
src/main/resources/static/pages/permission/user/add.html
src/main/resources/static/real_control_v2/fragments/line_schedule/context_menu/fcxxwt.html
src/main/resources/static/real_control_v2/js/line_schedule/sch_table.js
src/main/resources/static/real_control_v2/main.html
+package com.bsth.controller.realcontrol;
+
+import com.bsth.data.schedule.DayOfSchedule;
+import com.bsth.entity.realcontrol.ScheduleRealInfo;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RequestMethod;
+import org.springframework.web.bind.annotation.RequestParam;
+import org.springframework.web.bind.annotation.RestController;
+
+import java.util.HashSet;
+import java.util.List;
+import java.util.Set;
+
+/**
+ * 相关数据异常检测
+ * Created by panzhao on 2017/4/14.
+ */
+@RestController
+@RequestMapping("anomalyCheck")
+public class anomalyCheckController {
+
+
+    Logger logger = LoggerFactory.getLogger(this.getClass());
+
+    @Autowired
+    DayOfSchedule dayOfSchedule;
+    /**
+     * 出现重复班次的车辆
+     * @param nbbm
+     */
+    @RequestMapping(value = "/schRepeat", method = RequestMethod.POST)
+    public void schRepeat(@RequestParam String nbbm){
+        logger.info("前端通知，车辆 " + nbbm + "出现重复班次，开始检测...");
+        List<ScheduleRealInfo> list = dayOfSchedule.findByNbbm(nbbm);
+
+        Set<ScheduleRealInfo> set = new HashSet<>();
+        for(ScheduleRealInfo sch : list){
+            if(!set.add(sch)){
+                logger.info("出现一次重复班次，班次ID：" + sch.getId());
+            }
+        }
+
+        if(set.size() > 0){
+            dayOfSchedule.replaceByNbbm(nbbm, set);
+        }
+    }
+}
@@ -237,4 +237,9 @@ public class UserController extends BaseController&lt;SysUser, Integer&gt; {
 		}
 		return msg;
 	}
+
+	@RequestMapping(value = "/register" ,method = RequestMethod.POST)
+	public Map<String, Object> register(SysUser u){
+		return sysUserService.register(u);
+	}
 }
@@ -902,4 +902,16 @@ public class DayOfSchedule implements CommandLineRunner {
         }
         return rs;
     }
+
+    /**
+     * 覆盖一辆车的所有班次
+     * @param nbbm
+     * @param sets
+     */
+    public void replaceByNbbm(String nbbm, Set<ScheduleRealInfo> sets){
+        nbbmScheduleMap.removeAll(nbbm);
+        nbbmScheduleMap.putAll(nbbm, sets);
+        //重新计算班次应到时间
+        updateQdzTimePlan(nbbm);
+    }
 }
 \ No newline at end of file
@@ -3,6 +3,8 @@ package com.bsth.service.sys;
 import com.bsth.entity.sys.SysUser;
 import com.bsth.service.BaseService;
+import java.util.Map;
+
 public interface SysUserService extends BaseService<SysUser, Integer>{
 	SysUser findByUserName(String name);
@@ -10,4 +12,6 @@ public interface SysUserService extends BaseService&lt;SysUser, Integer&gt;{
 	int changeEnabled(int id,int enabled);
 	int changePWD(int id,String newPWD);
+
+	Map<String,Object> register(SysUser u);
 }
 package com.bsth.service.sys.impl;
-import java.util.Map;
-
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.security.crypto.bcrypt.BCryptPasswordEncoder;
-import org.springframework.stereotype.Service;
-
+import com.bsth.common.ResponseCode;
 import com.bsth.entity.sys.SysUser;
 import com.bsth.repository.sys.SysUserRepository;
-import com.bsth.security.util.SecurityUtils;
 import com.bsth.service.impl.BaseServiceImpl;
 import com.bsth.service.sys.SysUserService;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.security.crypto.bcrypt.BCryptPasswordEncoder;
+import org.springframework.stereotype.Service;
+
+import java.util.HashMap;
+import java.util.Map;
 @Service
 public class SysUserServiceImpl extends BaseServiceImpl<SysUser, Integer> implements SysUserService{
 	@Autowired
 	SysUserRepository sysUserRepository;
+
+	Logger logger = LoggerFactory.getLogger(this.getClass());
 	@Override
 	public SysUser findByUserName(String name) {
@@ -45,4 +49,25 @@ public class SysUserServiceImpl extends BaseServiceImpl&lt;SysUser, Integer&gt; implem
 	public int changePWD(int id,String newPWD) {
 		return sysUserRepository.changePWD(id,new BCryptPasswordEncoder(4).encode(newPWD));
 	}
+
+	@Override
+	public Map<String, Object> register(SysUser u) {
+		Map<String, Object> rs = new HashMap();
+		try{
+			//检查用户名是否存在
+			if(findByUserName(u.getUserName()) != null){
+				rs.put("status", ResponseCode.ERROR);
+				rs.put("msg", "用户名" + u.getUserName() + "已存在！");
+			}
+			else{
+				u.setPassword(new BCryptPasswordEncoder(4).encode(u.getPassword()));
+				rs = super.save(u);
+			}
+		}catch (Exception e){
+			logger.error("", e);
+			rs.put("status", ResponseCode.ERROR);
+			rs.put("msg", e.getMessage());
+		}
+		return rs;
+	}
 }
+/**
+ * 处理线调文件
+ */
+var fs = require('fs')
+    ,cheerio = require('cheerio')
+    ,minifier = require('./minifier')
+    ,crypto = require("crypto")
+    ,CleanCSS = require('clean-css')
+    ,UglifyJS = require("uglify-js");;
+
+//不参与的目录
+var pName = 'bsth_control'
+    ,path = process.cwd()
+    //根目录
+    ,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';
+
+
+var mainFile = dest + _static + '\\real_control_v2\\main.html';
+var realCtl = {
+    /**
+     * 处理线调首页
+     */
+    handleMain: function(cb){
+        //读取文件
+        var data = fs.readFileSync(mainFile, 'utf-8')
+            ,$ = cheerio.load(data);
+
+        handleCss($, function () {
+            handleJs($, cb);
+        });
+    }
+};
+
+/**
+ * 处理css
+ * @type {any}
+ */
+var handleCss = function ($, cb) {
+    var cssArray = $('link[rel=stylesheet][merge]');
+    //按 merge 值分组
+    var cssMap = {}, mergeName;
+    for(var i = 0, c; c = cssArray[i++];){
+        mergeName = $(c).attr('merge');
+        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;
+    (function () {
+        if(index >= ks.length){
+            cb && cb();
+            return;
+        }
+        var k = ks[index];
+        index ++;
+        var f = arguments.callee;
+        //合并css
+        new CleanCSS().minify(cssMap[k], function (error, out) {
+            var data = out.styles;
+            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.write(fd, data, function(){
+                    $('head').append('<link rel="stylesheet" href="/real_control_v2/assets/css/'+fName+'"/>');
+                    console.log(k + ' css', '结束，下一个');
+                    f();
+                });
+            });
+        });
+    })();
+};
+
+/**
+ * 处理js
+ */
+var handleJs = function ($, cb) {
+    var scriptArray = $('script[merge]');
+    //按 merge 值分组
+    var jsMap = {}, mergeName;
+    for(var i = 0, s; s = scriptArray[i++];){
+        mergeName = $(s).attr('merge');
+        if(!jsMap[mergeName])
+            jsMap[mergeName] = [];
+        jsMap[mergeName].push(dest + _static + $(s).attr('src'));
+        //remove
+        $(s).remove();
+    }
+
+    //按 merge 合并压缩js
+    var ks = get_keys(jsMap), index=0;
+    (function () {
+        if(index >= ks.length){
+            write(mainFile, $.html());
+            console.log('线调处理结束'.green);
+            cb && cb();
+            return;
+        }
+        var k = ks[index];
+        index ++;
+        var f = arguments.callee;
+        //合并压缩js
+        var result = UglifyJS.minify(jsMap[k]);
+        var data = result.code;
+        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.write(fd, data, function(){
+                $('body').append('<script src="/real_control_v2/assets/js/'+fName+'"></script>');
+                console.log(k + ' js', '结束，下一个');
+                f();
+            });
+        });
+    })();
+};
+
+var get_keys = function (json) {
+    var array = [];
+    for (var key in json) {
+        array.push(key);
+    }
+    return array;
+};
+
+function md5(text){
+    return crypto.createHash("md5").update(text).digest("hex");
+}
+
+function write(file, text){
+    fs.writeFile(file, text, function (err) {
+        if (err){
+            console.log(err.toString().red);
+            process.exit();
+        }
+        console.log(file.green);
+    });
+}
+
+
+module.exports = realCtl;
 \ No newline at end of file
@@ -10,6 +10,7 @@
   "license": "ISC",
   "dependencies": {
     "cheerio": "^0.20.0",
+    "clean-css": "^4.0.12",
     "colors": "^1.1.2",
     "eventproxy": "^0.3.4",
     "uglify-js": "^2.6.2"
@@ -51,7 +51,7 @@ var parse = {
 		}
 		return {jsArray: linkArray, $: $, scriptString: scriptString};
 	}
-}
+};
 function md5(text){
@@ -8,7 +8,8 @@ var fs = require(&#39;fs&#39;)
 	,EventProxy = require('eventproxy')
 	,parse = require('./parse')
 	,minifier = require('./minifier')
-	,crypto = require("crypto");
+	,crypto = require("crypto")
+	,handle_real_ctl = require('./handle_real_ctl');
 //不参与的目录
 var excludes = ['scheduleApp', 'trafficManage', 'control']
@@ -74,15 +75,18 @@ ep.tail(&#39;check-js&#39;, function(){
 //合并压缩JS
 ep.tail('minifier-js', function(){
 	logInfo('handle index.html...');
-	
-	//先处理首页
+
+	//再处理首页
 	ep.emit('handle-index', function(){
 		//递归处理片段
 		walk(dest + _static + '\\pages', function(item){
 			ep.emit('handle-fragment', item);
 		},
 		function(){
-			ep.emit('package-jar');
+			//处理线调
+			handle_real_ctl.handleMain(function () {
+				ep.emit('package-jar');
+			});
 		});
 	});
 });
@@ -150,10 +150,26 @@
 			submitHandler : function(f) {
 				var params = form.serializeJSON();
 				error.hide();
-				console.log(params);
-				
-				//检查一下用户是否存在
-				$get('/user/all', {userName_eq: params.userName}, function(list){
+
+				$.ajax({
+					url: '/user/register',
+					type: 'POST',
+					traditional: true,
+					data: params,
+					success: function(rs){
+						if(!rs){
+							layer.msg('未知异常！');
+						}
+						if(rs.status=='SUCCESS'){
+							layer.msg('添加用户成功.');
+							loadPage('list.html');
+						}
+						else if(rs.status=='ERROR'){
+							layer.msg('添加失败[ ' + rs.msg + ']');
+						}
+					}
+				});
+				/*$get('/user/all', {userName_eq: params.userName}, function(list){
 					if(!list || list.length == 0){
 						console.log(params);
 						$.ajax({
@@ -166,14 +182,14 @@
 								loadPage('list.html');
 							}
 						});
-						/* $post('/user', params, function(res){
+						/!* $post('/user', params, function(res){
 							layer.msg('添加用户成功.');
 							loadPage('list.html');
-						}); */
+						}); *!/
 					}
 					else
 						layer.alert('用户【' + params.userName + '】已存在', {icon: 2, title: '提交被拒绝'});
-				});
+				});*/
 			}
 		});
 	});
@@ -129,7 +129,7 @@
             <div class="uk-width-1-1">
                 <div class="uk-form-row ct-stacked">
                     <div class="uk-form-controls" style="margin-top: 5px;">
-                        <textarea id="form-s-t" cols="30" rows="5" name="remarks" data-fv-stringlength="true" data-fv-stringlength-max="20" placeholder="备注，不超过20个字符">{{sch.remarks}}</textarea>
+                        <textarea id="form-s-t" cols="30" rows="5" name="remarks" data-fv-stringlength="true" data-fv-stringlength-max="50" placeholder="备注，不超过50个字符">{{sch.remarks}}</textarea>
                     </div>
                 </div>
             </div>
@@ -8,7 +8,28 @@ var gb_schedule_table = (function () {
     //车辆应发未发车辆数
     var car_yfwf_map = {};
     var schedule_sort = function (s1, s2) {
-        return s1.dfsjT - s2.dfsjT;
+        return s1.fcsjT - s2.fcsjT;
+    };
+
+    /**
+     * 检查是否存在重复班次
+     * @param list
+     */
+    var isRepeatData = function (list) {
+        var map = {}, reps = [];
+        for(var i = 0,sch;sch=list[i++];){
+            if(map[sch.id]){
+                reps.push(sch.clZbh);
+            }
+            map[sch.id] = sch;
+        }
+
+        //通知服务端数据有异常
+        $.each(reps, function () {
+            $.post('/anomalyCheck/schRepeat', {nbbm: this});
+        });
+
+        return gb_common.get_vals(map);
     };
     var show = function (cb) {
@@ -20,6 +41,9 @@ var gb_schedule_table = (function () {
                 //排序
                 rs[lineCode].sort(schedule_sort);
                 line2Schedule[lineCode] = {};
+                //------是否有重复班次 #临时代码，为服务端提供诊断信息已解决这个问题
+                rs[lineCode] = isRepeatData(line2Schedule[lineCode]);
+
                 //calc shift
                 $.each(rs[lineCode], function () {
                     calc_sch_real_shift(this);
@@ -32,7 +32,7 @@
     <link rel="stylesheet" href="/real_control_v2/assets/plugins/jstree/default/style.min.css"/>
     <!-- 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"/>
+    <link rel="stylesheet" href="/real_control_v2/css/pace.css" merge="custom_style"/>
     <link rel="stylesheet" href="/real_control_v2/css/modal_extend.css" merge="custom_style"/>
 </head>
@@ -100,9 +100,9 @@
 <!-- jquery -->
 <script src="/real_control_v2/assets/js/jquery.min.js"></script>
 <!-- jquery actual -->
-<script src="/real_control_v2/assets/js/jquery.actual.min.js"></script>
+<script src="/real_control_v2/assets/js/jquery.actual.min.js" merge="plugins"></script>
 <!-- jquery.serializejson JSON序列化插件 -->
-<script src="/assets/plugins/jquery.serializejson.js"></script>
+<script src="/assets/plugins/jquery.serializejson.js"  merge="plugins"></script>
 <!-- moment.js 日期处理类库 -->
 <script src="/assets/plugins/moment-with-locales.js"></script>
 <!-- common js -->
@@ -126,18 +126,18 @@
 <script src="/real_control_v2/assets/plugins/uikit-2.27.1/components/lightbox.min.js" merge="uikit_js"></script>
 <!-- jquery contextMenu -->
-<script src="/real_control_v2/assets/js/jquery.contextMenu.min.js"></script>
-<script src="/real_control_v2/assets/js/jquery.ui.position.min.js"></script>
+<script src="/real_control_v2/assets/js/jquery.contextMenu.min.js"  merge="plugins"></script>
+<script src="/real_control_v2/assets/js/jquery.ui.position.min.js"  merge="plugins"></script>
 <!-- formvalidation- -->
-<script src="/real_control_v2/assets/plugins/formvalidation/formValidation.min.js"></script>
-<script src="/real_control_v2/assets/plugins/formvalidation/zh_CN.js"></script>
-<script src="/real_control_v2/assets/plugins/formvalidation/uikit.min.js"></script>
+<script src="/real_control_v2/assets/plugins/formvalidation/formValidation.min.js"  merge="plugins"></script>
+<script src="/real_control_v2/assets/plugins/formvalidation/zh_CN.js"  merge="plugins"></script>
+<script src="/real_control_v2/assets/plugins/formvalidation/uikit.min.js"  merge="plugins"></script>
 <!-- js tree -->
-<script src="/real_control_v2/assets/plugins/jstree/jstree.min.js"></script>
+<script src="/real_control_v2/assets/plugins/jstree/jstree.min.js"  merge="plugins"></script>
 <!-- simple pinyin -->
 <script src="/assets/plugins/pinyin.js"></script>
 <!-- qtip -->
-<script src="/real_control_v2/assets/plugins/qtip/jquery.qtip.min.js"></script>
+<script src="/real_control_v2/assets/plugins/qtip/jquery.qtip.min.js" merge="plugins"></script>
 <!-- 数据 -->
 <script src="/real_control_v2/js/data/data_basic.js" merge="custom_js"></script>