update

潘钊
1 parent a492e608
Showing 15 changed files with 318 additions and 65 deletions
src/main/java/com/bsth/controller/directive/DirectiveController.java
src/main/java/com/bsth/controller/forecast/SampleController.java
src/main/java/com/bsth/controller/forecast/dto/CreateSampleParam.java
src/main/java/com/bsth/data/arrival/ArrivalData_GPS.java
src/main/java/com/bsth/data/gpsdata/GpsRealData.java
src/main/java/com/bsth/service/impl/StationRouteServiceImpl.java
src/main/java/com/bsth/util/FTPClientUtils.java
src/main/java/com/bsth/util/PackTarGZUtils.java
src/main/resources/ftp.properties
src/main/resources/ms-jdbc.properties
src/main/resources/static/login.html
src/main/resources/static/pages/control/line/index.html
src/main/resources/static/pages/control/line/js/home.js
src/main/resources/static/pages/forecast/sample/css/main.css
src/main/resources/static/pages/forecast/sample/main.html
@@ -62,7 +62,7 @@ public class DirectiveController {
 	 * @param @param lineId 新线路编码
 	 * @throws
 	 */
-	@RequestMapping(value = "/lineChnage", method = RequestMethod.POST)
+	@RequestMapping(value = "/lineChnage", method = RequestMethod.GET)
 	public int lineChange(@RequestParam String nbbm, @RequestParam Integer lineId){
 		SysUser user = SecurityUtils.getCurrentUser();
 		return directiveService.lineChange(nbbm, lineId, user.getUserName());
 package com.bsth.controller.forecast;
+import java.io.UnsupportedEncodingException;
+import java.net.URLDecoder;
+
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RequestParam;
 import org.springframework.web.bind.annotation.RestController;
+import com.alibaba.fastjson.JSON;
+import com.alibaba.fastjson.JSONObject;
 import com.bsth.controller.BaseController;
+import com.bsth.controller.forecast.dto.CreateSampleParam;
 import com.bsth.entity.forecast.Sample;
 import com.bsth.service.forecast.SampleService;
@@ -16,7 +23,15 @@ public class SampleController extends BaseController&lt;Sample, Long&gt;{
 	SampleService sampleService;
 	@RequestMapping("/create/gps")
-	public int createDataByGps(String lineCode, Integer updown){
-		return sampleService.createDataByGps(lineCode, updown);
+	public int createDataByGps(@RequestParam String data){
+		
+		try {
+			data = URLDecoder.decode(data, "utf-8");
+			CreateSampleParam param = JSONObject.toJavaObject(JSON.parseObject(data), CreateSampleParam.class);
+			System.out.println(param);
+		} catch (UnsupportedEncodingException e) {
+			e.printStackTrace();
+		}
+		return 0;
 	}
 }
+package com.bsth.controller.forecast.dto;
+
+import java.util.Set;
+
+public class CreateSampleParam {
+	
+	private String lineCode;
+	
+	private String startDate;
+	
+	private String endDate;
+	
+	private Integer updown;
+	
+	private Set<TimeRange> timeRange;
+	
+	public static class TimeRange{
+		private String s;
+		private String e;
+		private String tag;
+		public String getS() {
+			return s;
+		}
+		public void setS(String s) {
+			this.s = s;
+		}
+		public String getE() {
+			return e;
+		}
+		public void setE(String e) {
+			this.e = e;
+		}
+		public String getTag() {
+			return tag;
+		}
+		public void setTag(String tag) {
+			this.tag = tag;
+		}
+	}
+
+	public String getLineCode() {
+		return lineCode;
+	}
+
+	public void setLineCode(String lineCode) {
+		this.lineCode = lineCode;
+	}
+
+	public String getStartDate() {
+		return startDate;
+	}
+
+	public void setStartDate(String startDate) {
+		this.startDate = startDate;
+	}
+
+	public String getEndDate() {
+		return endDate;
+	}
+
+	public void setEndDate(String endDate) {
+		this.endDate = endDate;
+	}
+
+	public Integer getUpdown() {
+		return updown;
+	}
+
+	public void setUpdown(Integer updown) {
+		this.updown = updown;
+	}
+
+	public Set<TimeRange> getTimeRange() {
+		return timeRange;
+	}
+
+	public void setTimeRange(Set<TimeRange> timeRange) {
+		this.timeRange = timeRange;
+	}
+}
@@ -50,7 +50,7 @@ public class ArrivalData_GPS implements CommandLineRunner{
 	@Override
 	public void run(String... arg0) throws Exception {
-		Application.mainServices.scheduleWithFixedDelay(dataLoaderThread, 30, 15, TimeUnit.SECONDS);
+		Application.mainServices.scheduleWithFixedDelay(dataLoaderThread, 30, 12, TimeUnit.SECONDS);
 	}
 	@Component
@@ -9,6 +9,7 @@ import java.util.Map;
 import java.util.NavigableSet;
 import java.util.concurrent.TimeUnit;
+import org.apache.commons.lang3.StringUtils;
 import org.apache.http.HttpEntity;
 import org.apache.http.client.methods.CloseableHttpResponse;
 import org.apache.http.client.methods.HttpGet;
@@ -146,9 +147,14 @@ public class GpsRealData implements CommandLineRunner{
 					if (jsonObj != null) 
 						list = JSON.parseArray(jsonObj.getString("data"), GpsEntity.class);
+					String nbbm;
 					//附加车辆内部编码
 					for(GpsEntity gps : list){
-						gps.setNbbm(BasicData.deviceId2NbbmMap.get(gps.getDeviceId()));
+						nbbm = BasicData.deviceId2NbbmMap.get(gps.getDeviceId());
+						if(StringUtils.isBlank(nbbm))
+							continue;
+						
+						gps.setNbbm(nbbm);
 						gps.setStationName(BasicData.stationCode2NameMap.get(gps.getStopNo()));
 						add(gps);
 					}
@@ -579,12 +579,12 @@ public class StationRouteServiceImpl extends BaseServiceImpl&lt;StationRoute, Integ
 				File textFile = clientUtils.GetFtpFile(url, port, username, password, remotePath, textFileName);
 				/*File[] sources = new File[] {textFile};*/
-				File[] sources = new File[] {textFile};
+				//File[] sources = new File[] {textFile};
 				File target = new File(odlGzFileName);
 				// 将txt文件打包
-				File targetFile = packTarGZUtils.pack(sources, target);
+				File targetFile = PackTarGZUtils.compress(textFile, target);
 				/*clientUtils.testUpLoadFromDisk(targetFile,targetFile.getName());*/
@@ -66,12 +66,10 @@ public class FTPClientUtils {
 			}
 			ftp.changeWorkingDirectory(path);
-			
+			ftp.setFileType(FTPClient.BINARY_FILE_TYPE);
 			ftp.enterLocalPassiveMode();
-			
 			success = ftp.storeFile(new String(filename.getBytes("gbk"),"gbk"), input);
 			/*success = ftp.storeFile(filename, input);	*/
-			
 			input.close();
 			ftp.logout();
@@ -322,6 +320,7 @@ public class FTPClientUtils {
             }  
+            out.flush();
             ftp.logout(); 
         } catch (IOException e){  
@@ -95,9 +95,9 @@ public class PackTarGZUtils {
 	  * @throws
 	  * 
 	  */
-	 public static File compress(File source) {
+	 public static File compress(File source, File target) {
-	  File target = new File(source.getName() + ".gz");
+	  //File target = new File(source.getName() + ".gz");
 	  FileInputStream in = null;
@@ -117,6 +117,9 @@ public class PackTarGZUtils {
 			  out.write(array, 0, number);
 		  }
+		  
+		  out.finish();
+		  out.flush();
 	  } catch (FileNotFoundException e) {
 	   e.printStackTrace();
@@ -164,4 +167,9 @@ public class PackTarGZUtils {
 	return target;
    }
+	 
+	 public static void main(String[] args) {
+		 File f = compress(new File("C:\\Users\\panzhao\\Desktop\\111\\1025.txt"), new File("C:\\Users\\panzhao\\Desktop\\111\\333\\1025.txt.gz"));
+		 
+	}
 }
-ftp.url=222.66.0.205
+ftp.url=116.236.238.212
 ftp.port=21
 ftp.username=transport
 ftp.password=transport123
 ms.mysql.driver= com.mysql.jdbc.Driver
-ms.mysql.url= jdbc:mysql://192.168.168.201:3306/ms?useUnicode=true&characterEncoding=utf-8
+ms.mysql.url= jdbc:mysql://127.0.0.1:3306/ms?useUnicode=true&characterEncoding=utf-8
 ms.mysql.username= root
-ms.mysql.password= 123456
+ms.mysql.password= panzhao
 #ms.mysql.driver= com.mysql.jdbc.Driver
 #ms.mysql.url= jdbc:mysql://192.168.168.171:3306/ms?useUnicode=true&characterEncoding=utf-8
@@ -153,6 +153,11 @@ img.captcha-img{
     text-align: center;
     color: #a6a6a6;
 }
+
+h3.logo-text{
+	font-family: 华文楷体,华文细黑;
+	font-size: 28px;
+}
 </style>
 </head>
@@ -160,7 +165,7 @@ img.captcha-img{
 	<div class="wrapper ng-scope">
 		<div id="loginPanel" class="dialog dialog-shadow">
 			<br>
-			<h3>闵行公交调度系统  </h3>
+			<h3 class="logo-text">闵行公交调度系统  </h3>
 			<hr>
 			<form style="padding: 0px 35px;">
 				<div class="form-group" style="margin-bottom: 0">
@@ -182,7 +187,7 @@ img.captcha-img{
 				<div class="form-group" id="captchaWrap">
 					<label></label>
 					<div class="input-icon">
-						<input type="password" name="captcha" style="width: 153px !important;"
+						<input type="text" name="captcha" style="width: 153px !important;"
 							class="form-control input-inline input-medium" placeholder="输入验证码" >
 						<span class="help-inline"> <img alt="验证码" class="captcha-img" title="点击刷新验证码"> </span>
@@ -228,8 +228,8 @@ function countDown(name){
 <script>
 var updateLog = {
-	text: '<div class="updete_log"><p>1、...</p></div>'
-	,title: '2016年8月28号更新日志'
+	text: '<div class="updete_log"><p>1、过滤掉未加入调度配置的GPS信号。</p></div>'
+	,title: '2016年9月13号更新日志'
 }
 var lineCodes = '' //全部线路编码字符串，由data.js初始化
@@ -85,18 +85,18 @@ var _home = (function() {
 				$('menu.menu').show();
 			}, 400);
-			/*setTimeout(function() {
+			setTimeout(function() {
 				// 提示文本
-				var promptFlag = storage.getItem('promptFlag_0828');
+				var promptFlag = storage.getItem('promptFlag_0913');
 				if (!promptFlag) {
 					layer.alert(updateLog.text, {
 						title: updateLog.title,
 						area: ['410px', '250px'],
 						shift : 5
 					});
-					storage.setItem('promptFlag_0828', 1);
+					storage.setItem('promptFlag_0913', 1);
 				}
-			}, 1500);*/
+			}, 1500);
 		}
 	}
@@ -225,32 +225,90 @@ rect.f_rect{
 #forecastSamplePanel .tab-content::-webkit-scrollbar,
-#forecastSamplePanel #trafficChart::-webkit-scrollbar {  
+#forecastSamplePanel #trafficChart::-webkit-scrollbar,
+#sptItems::-webkit-scrollbar{  
     width: 15px;
     height: 16px;  
 }  
 #forecastSamplePanel .tab-content::-webkit-scrollbar-track,  
 #forecastSamplePanel .tab-content::-webkit-scrollbar-thumb,
 #forecastSamplePanel #trafficChart::-webkit-scrollbar-track,  
-#forecastSamplePanel #trafficChart::-webkit-scrollbar-thumb {  
+#forecastSamplePanel #trafficChart::-webkit-scrollbar-thumb,
+#sptItems::-webkit-scrollbar-track,
+#sptItems::-webkit-scrollbar-thumb {  
   border-radius: 999px;  
   border: 5px solid transparent;  
 }  
 #forecastSamplePanel .tab-content::-webkit-scrollbar-thumb,
-#forecastSamplePanel #trafficChart::-webkit-scrollbar-thumb {  
+#forecastSamplePanel #trafficChart::-webkit-scrollbar-thumb,
+#sptItems::-webkit-scrollbar-thumb {  
   min-height: 20px;  
   background-clip: content-box;  
   box-shadow: 0 0 0 5px rgba(0,0,0,.2) inset;  
 }  
 #forecastSamplePanel .tab-content::-webkit-scrollbar-corner,
-#forecastSamplePanel #trafficChart::-webkit-scrollbar-corner {  
+#forecastSamplePanel #trafficChart::-webkit-scrollbar-corner,
+#sptItems::-webkit-scrollbar-corner {  
   background: transparent;  
 }
 #forecastPopForm.form-horizontal .form-group{
-    margin: 15px 7px;
+    margin: 15px 7px 0;
 }
 #forecastPopForm.form-horizontal{
     margin: 15px;
+}
+
+#forecastPopForm.form-horizontal h6{
+	border-bottom: 1px solid #eeeeee;padding: 8px 0 10px;color: gray;
+}
+
+.forecast-spt-item{
+    margin: 8px 0;
+    padding: 8px 0;
+    /* border-bottom: 1px solid #c2cad8; */
+    position: relative;
+}
+
+.forecast-spt-item>div{
+    padding: 0 0 0 15px;
+}
+
+.forecast-spt-item>div.e-date{
+	padding: 0 15px 0 0;
+}
+
+#forecastPopForm .form-actions{
+	    border-top: 1px solid #eeeeee;
+    margin-top: 12px;
+    padding-top: 13px;
+    text-align: center;
+}
+
+.forecast-item-close{
+    position: absolute;
+    z-index: 9;
+    left: 15px;
+    top: 13px;
+    width: 10px;
+    height: 10px;
+    background: #fff;
+    padding: 0 5px !important;
+    font-size: 18px;
+    cursor: pointer;
+    font-weight: 600;
+    color: #ea8d8d;
+}
+
+.forecast-item-close:HOVER {
+	color: red;
+}
+
+#sptItems{
+    height: 304px;
+    overflow-y: auto;
+    overflow-x: hidden;
+    padding-right: 15px;
+    margin: 15px 0px;
 }
 \ No newline at end of file
@@ -62,45 +62,68 @@
         <div class="form-group">
             <label class="col-md-3 control-label">线路</label>
             <div class="col-md-9">
-                <input type="text" class="form-control" value="闵行11路" readonly>
+				<input type="hidden" name="lineCode" value="{{line.code}}">
+                <input type="text" class="form-control" value="{{line.name}}" style="width: 180px;" readonly>
             </div>
         </div>
 		<div class="form-group">
 		     <label class="col-md-3 control-label">走向</label>
 		     <div class="col-md-9">
-		         <select class="form-control input-inline input-medium" readonly>
-		         	<option value="0">上行</option>
-		         </select>
+				 <input type="hidden" name="updown" value={{updown}}>
+				 <input type="text" class="form-control" value='{{updown == 0?"上行":"下行"}}' style="width: 180px;" readonly>
 		     </div>
 		 </div>
-		 <h6 style="margin: 20px 0;border-bottom: 1px solid #eeeeee;padding: 15px 0 10px;color: gray;">1、 告诉我应该使用哪些GPS数据</h6>
+		 <h6><i class="fa fa-question-circle"></i> 使用哪些天的GPS数据</h6>
 		 <div class="form-group">
-            <label class="col-md-3 control-label">gps起始时间</label>
+            <label class="col-md-3 control-label">起始日期</label>
             <div class="col-md-9">
-                <input type="date" class="form-control" >
+                <input type="date" class="form-control" style="width: 180px;" name="startDate" value="{{sdate}}" required>
             </div>
         </div>
 		<div class="form-group">
-            <label class="col-md-3 control-label">gps截止时间</label>
+            <label class="col-md-3 control-label">截止日期</label>
             <div class="col-md-9">
-                <input type="date" class="form-control" >
+                <input type="date" class="form-control" style="width: 180px;" name="endDate" value="{{cdate}}" required>
             </div>
         </div>
-		 <h6 style="margin: 20px 0;border-bottom: 1px solid #eeeeee;padding: 15px 0 10px;color: gray;">2、 你想怎么划分时区</h6>
-		 <div class="form-group">
-            <label class="col-md-3 control-label">...</label>
-            <div class="col-md-9">
-                <input type="date" class="form-control" >
-            </div>
-        </div>
+		 <h6><i class="fa fa-question-circle"></i> 你想怎么划分时区</h6>
+		 <div class="form-group" id="sptItems">
+			{{each drs as dr i }}
+			<div class="forecast-spt-item row">
+				<div class="forecast-item-close"><i class="fa fa-times-circle" ></i></div>
+				<div class="col-md-offset-1 col-md-4">
+					<input type="text" class="form-control" name="dr_name[]" placeholder="时区名称"  value="{{dr.name}}" required>
+				</div>
+				<div class="col-md-3 s-date">
+					<input type="time" class="form-control" name="dr_stime[]" placeholder="开始时间"  value="{{dr.s}}" required> 
+				</div>
+				<div class="col-md-1" style="padding-top: 10px;">至</div>
+				<div class="col-md-3 e-date">
+					<input type="time" class="form-control" name="dr_etime[]" placeholder="结束时间"  value="{{dr.e}}" required>
+				</div>
+			</div>
+			{{/each}}
+         </div>
+
+			<div class="footer">
+				<a href="javascript:;" style="text-indent: 28px;" class="add-item"><i class="fa fa-plus"></i> 添加项</a>
+			</div>
+
+			<div class="form-actions">
+			    <div class="row">
+			        <div class="col-md-12" style="">
+			            <button type="submit" class="btn green">开始生成数据</button>
+			            <button type="button" class="btn default">取消</button>
+			        </div>
+			    </div>
+			</div>
      </div>
 </form>
 </script>
-
 <script src="/pages/forecast/sample/js/svg.js"></script>
 <script>
 !function(){
@@ -183,6 +206,10 @@
 		return $('.line_config_tree li.selected').data('code');
 	}
+	function getLineName(){
+		return $.trim($('.line_config_tree li.selected').text());
+	}
+	
 	function drawSvg(){
 		//绘制svg
 		var rts = [], updown = getUpdown();
@@ -199,32 +226,87 @@
 	$('#gpsCreateDataLink').on('click', function(){
-		/* var lineName = $('.line_config_tree ul li.selected button').text();
-		var updownText = $('.left_station_route ul li.active a').text();
-		
-		layer.confirm('使用GPS轨迹生成【'+lineName+' -'+updownText+'】站点间耗时数据？ 该操作将会清除原有数据。', {
-		  btn: ['我确定','算了吧'],
-		  icon: 3
-		}, function(){
-			
-		}); */
+		var drs = [{name: '早低谷', s: '00:00', e: '07:00'},{name: '早高峰', s: '07:01', e: '09:00'},{name: '平峰', s: '09:01', e: '16:00'},{name: '晚高峰', s: '16:01', e: '20:00'},{name: '晚低谷', s: '20:01', e: '23:59'}];
+		var line = {code: getLineCode(), name: getLineName()};
+		var cdate = moment().format('YYYY-MM-DD')
+			,sdate = moment().subtract(14, 'days').format('YYYY-MM-DD');
 		layer.open({
 		  type: 1,
-		  area: '530px',
-		  maxmin: true,
-		  content: template('forecast_gps_create_temp', {}),
+		  area: '580px',
+		 // maxmin: true,
+		  content: template('forecast_gps_create_temp', {updown: getUpdown(), line: line, drs: drs, cdate: cdate, sdate: sdate}),
 		  shift: 5,
-		  title: 'GPS生成数据',
-		  success: function(){
-			 /*  dictionaryUtils.transformDom($('#childTaskDiv .nt-dictionary'));
-			  $('#childTaskDiv').trigger('init', {
-				  selected: schedul, 
-				  _data: _data,
-				  _alone: _alone
-			   }); */
+		  title: '根据历史轨迹生成数据',
+		  success: function(layero){
+			  var f = $('#forecastPopForm');
+			  
+			  f.on('click', '.forecast-item-close' , function(){
+				   $(this).parent('.forecast-spt-item').remove();
+			   });
+			   $('.add-item', f).on('click', function(){
+				    var item = '<div class="forecast-spt-item row"><div class="forecast-item-close"><i class="fa fa-times-circle" ></i></div><div class="col-md-offset-1 col-md-4"><input type="text" class="form-control" name="dr_name[]" placeholder="时区名称"   required></div><div class="col-md-3 s-date"><input type="time" class="form-control" name="dr_stime[]" placeholder="开始时间"   required> </div><div class="col-md-1" style="padding-top: 10px;">至</div><div class="col-md-3 e-date"><input type="time" class="form-control" name="dr_etime[]" placeholder="结束时间"   required></div></div>';
+					$('#sptItems').append(item);
+					$('#sptItems').scrollTop( $('#sptItems')[0].scrollHeight );
+			   });
+			   
+			   f.on('submit', function(){
+				  try{
+					  if(customFormValidate(f)){
+						  var param = f.serializeJSON()
+						  		,timeRange = []
+						  		,size = param.dr_name.length;
+						  for(var i = 0; i < size; i ++)
+							  timeRange.push({tag: param.dr_name[i], s: param.dr_stime[i], e: param.dr_etime[i]});
+						  
+						  delete param.dr_name;
+						  delete param.dr_stime;
+						  delete param.dr_etime;
+						  param.timeRange = timeRange;
+						  
+						  $.post('/sample/create/gps', {data: encodeURI(JSON.stringify(param))}, function(rs){
+							 console.log(rs); 
+						  });
+					  }
+				  }catch (e){
+					  console.log(e);
+				  }
+				  
+				  return false;
+			   });
 		  }
 		});
 	});
+	
+	
+	/**
+	 * 自定义表单校验
+	 */
+	function customFormValidate(f){
+		var rs = true;
+		//所有可见的项
+		var es = $('input,select', f);
+		
+		for(var i = 0, e; e = es[i++];){
+			if($(e).attr('required') && ( $(e).val() == null || $(e).val() == '')){
+				if($(e).hasClass('select2-hidden-accessible'))
+					$(e).next().find('.select2-selection').addClass('custom-val-error');
+				else
+					$(e).addClass('custom-val-error');
+				rs = false;
+			}
+			else{
+				if($(e).hasClass('select2-hidden-accessible'))
+					$(e).next().find('.select2-selection').removeClass('custom-val-error');
+				else
+					$(e).removeClass('custom-val-error');
+			}
+		}
+		
+		if(!rs){
+			layer.alert('数据完整性校验失败，请检查输入项', {icon: 2, title: '操作失败',  shift: 5});    
+		}
+		return rs;
+	}
 }();
 </script>
 \ No newline at end of file