线路版本

YRF
1 parent b2ed1902
Showing 12 changed files with 115 additions and 53 deletions
src/main/java/com/bsth/controller/LineController.java
src/main/java/com/bsth/controller/LineVersionsController.java
src/main/java/com/bsth/entity/LineVersions.java
src/main/java/com/bsth/repository/LineVersionsRepository.java
src/main/java/com/bsth/service/LineVersionsService.java
src/main/java/com/bsth/service/impl/LineVersionsServiceImpl.java
src/main/resources/static/pages/base/line/editRoute.html
src/main/resources/static/pages/base/line/map.html
src/main/resources/static/pages/base/line/submit_select.html
src/main/resources/static/pages/base/lineversions/add.html
src/main/resources/static/pages/base/lineversions/js/lineversions-add-from.js
src/main/resources/static/pages/base/stationroute/edit_select.html
 package com.bsth.controller;
+import java.text.ParseException;
+import java.text.SimpleDateFormat;
+import java.util.Date;
 import java.util.HashMap;
 import java.util.Map;
@@ -11,7 +14,9 @@ import org.springframework.web.bind.annotation.RestController;
 import com.bsth.common.ResponseCode;
 import com.bsth.entity.Line;
+import com.bsth.entity.LineVersions;
 import com.bsth.service.LineService;
+import com.bsth.service.LineVersionsService;
 import com.bsth.util.GetUIDAndCode;
 /**
@@ -36,6 +41,9 @@ public class LineController extends BaseController&lt;Line, Integer&gt; {
 	@Autowired
 	private LineService service;
+	@Autowired
+	private LineVersionsService lineVersionsService;
+	
 	/**
 	 * 获取线路编码与ID
 	 * 
@@ -74,13 +82,31 @@ public class LineController extends BaseController&lt;Line, Integer&gt; {
 			map.put("status", ResponseCode.ERROR); 
 			return map;
 		}
-		return service.save(t);
+		// 添加线路版本
+		SimpleDateFormat simpleDateFormat = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
+		try {
+			Date endDate = simpleDateFormat.parse("2088-08-08 00:00:00");
+			LineVersions lineVersions = new LineVersions();
+			lineVersions.setName("原始版本");
+			lineVersions.setLine(t);
+			lineVersions.setLineCode(t.getLineCode());
+			lineVersions.setStartDate(t.getCreateDate());
+			lineVersions.setEndDate(new java.sql.Date(endDate.getTime()));// 2088-8-8 00:00:00
+			lineVersions.setVersions(1);
+			lineVersions.setStatus(1);
+			// 先添加线路再添加版本
+			service.save(t);
+			return lineVersionsService.save(lineVersions);
+		} catch (ParseException e) {
+			// TODO Auto-generated catch block
+			e.printStackTrace();
+			map.put("status", ResponseCode.ERROR); 
+			return map;
+		}
 	} 
 	/**
-	 * 
 	 * 更改
-	 * 
 	 */
 	@RequestMapping(value="/update", method = RequestMethod.POST)
 	public Map<String, Object> update(Line l){
@@ -12,16 +12,9 @@ import org.springframework.web.bind.annotation.RequestMethod;
 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.alibaba.fastjson.TypeReference;
-import com.bsth.data.LineVersionsData;
 import com.bsth.entity.Line;
 import com.bsth.entity.LineVersions;
-import com.bsth.entity.LsStationRoute;
-import com.bsth.entity.StationRoute;
 import com.bsth.repository.LineRepository;
-import com.bsth.repository.LsStationRouteRepository;
 import com.bsth.service.LineVersionsService;
 /**
@@ -46,8 +39,15 @@ public class LineVersionsController extends BaseController&lt;LineVersions, Integer
 	@Autowired
 	LineRepository lineRepository;
-	  @Autowired
-	    LsStationRouteRepository  lsStationRouteRepository ;
+	
+	/**
+	 * 获取线路所有版本
+	 */
+	@RequestMapping(value = "findLineVersionsMax", method = RequestMethod.GET)
+	public LineVersions findLineVersionsMax(@RequestParam(defaultValue = "lineId") int lineId) {
+		return service.findLineVersionsMax(lineId);
+	}
+	
 	/**
 	 * 获取线路所有版本
 	 * 
@@ -63,7 +63,6 @@ public class LineVersionsController extends BaseController&lt;LineVersions, Integer
 	 */
 	@RequestMapping(value = "findById", method = RequestMethod.GET)
 	public LineVersions findOne(@RequestParam(defaultValue = "id") int id) {
-		service.lineUpdate();
 		return service.findById(id);
 	}
@@ -85,6 +84,7 @@ public class LineVersionsController extends BaseController&lt;LineVersions, Integer
 			Date startDate = simpleDateFormat.parse(map.get("startDate").toString());
 			Date endDate = simpleDateFormat.parse(map.get("endDate").toString());
 			Line line = lineRepository.findOne(Integer.valueOf(map.get("lineId").toString())); 
+			lineVersions.setName(map.get("name").toString());
 			lineVersions.setLine(line);
 			lineVersions.setLineCode(map.get("lineCode").toString());
 			lineVersions.setStartDate(new java.sql.Date(startDate.getTime()));
@@ -92,6 +92,8 @@ public class LineVersionsController extends BaseController&lt;LineVersions, Integer
 			lineVersions.setVersions(Integer.valueOf(map.get("versions").toString()));
 			lineVersions.setStatus(Integer.valueOf(map.get("status").toString()));
 			lineVersions.setRemark(map.get("remark").toString());
+			
+			
 		} catch (ParseException e) {
 			// TODO Auto-generated catch block
 			e.printStackTrace();
@@ -32,6 +32,11 @@ public class LineVersions{
 	/** ID 主键(唯一标识符) int length(11) */
 	private Integer id;
+	/** 线路版本名字 varchar length(50)
+	 * 	给排版人员选版本使用
+	 *  */ 
+	private String name;
+	
 	/** 线路ID  int length(11) */
 	@ManyToOne
 	private Line line;
@@ -71,6 +76,14 @@ public class LineVersions{
 	public void setId(Integer id) {
 		this.id = id;
 	}
+	
+	public String getName() {
+		return name;
+	}
+
+	public void setName(String name) {
+		this.name = name;
+	}
 	public Line getLine() {
 		return line;
@@ -59,5 +59,12 @@ public interface LineVersionsRepository extends BaseRepository&lt;LineVersions, Int
 	@Modifying
 	@Query(value = "UPDATE LineVersions lv set lv.status=1 where lv.line.id=?1 and lv.lineCode=?2 and lv.versions=?3")
 	public void updateNewVersions(Integer lineId, String lineCode, Integer versions);
+
+	
+	/**
+	 * 查询线路最大线路版本
+	 */
+	@Query(value = "select lv2 from LineVersions lv2 where lv2.line.id =?1 and lv2.versions=(SELECT max(lv.versions) FROM LineVersions lv where lv.line.id = ?1) ")
+	public LineVersions findLineVersionsMax(int lineId);
 }
@@ -32,4 +32,6 @@ public interface LineVersionsService extends BaseService&lt;LineVersions, Integer&gt; 
 	List<LineVersions> lineUpdate();
+	LineVersions findLineVersionsMax(int lineId);
+
 }
@@ -9,7 +9,6 @@ import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
-import org.drools.core.time.impl.PseudoClockScheduler;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.jdbc.core.BatchPreparedStatementSetter;
 import org.springframework.jdbc.core.JdbcTemplate;
@@ -141,9 +140,8 @@ public class LineVersionsServiceImpl extends BaseServiceImpl&lt;LineVersions, Integ
     			jdbcTemplate.update("delete from bsth_c_stationroute where line = ?  and line_code = ?", lineId, lineCode);
     			String stationSql ="insert into bsth_c_stationroute(id,line,station,station_name,station_route_code,"
-    					+ "line_code,station_code,station_mark,out_station_nmber,directions,distances,"
-    					+ "to_time,first_time,end_time,descriptions,destroy,versions,create_by,create_date,"
-    					+ "update_by,update_date) values(?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?)";
+    					+ "line_code,station_code,station_mark,directions,distances,to_time,destroy,versions,"
+    					+ "create_date,update_date) values(?,?,?,?,?,?,?,?,?,?,?,?,?,?,?)";
     			jdbcTemplate.batchUpdate(stationSql, new BatchPreparedStatementSetter() {
 					@Override
@@ -158,19 +156,13 @@ public class LineVersionsServiceImpl extends BaseServiceImpl&lt;LineVersions, Integ
 						ps.setString(6, sRoute.getLineCode());
 						ps.setString(7, sRoute.getStationCode());
 						ps.setString(8, sRoute.getStationMark());
-						ps.setInt(9, sRoute.getOutStationNmber()==null ? 0:sRoute.getOutStationNmber());
-						ps.setInt(10, sRoute.getDirections());
-						ps.setDouble(11, sRoute.getDistances());
-						ps.setDouble(12, sRoute.getToTime());
-						ps.setString(13, sRoute.getFirstTime()==null ? "":sRoute.getFirstTime());
-						ps.setString(14, sRoute.getEndTime()==null ? "":sRoute.getEndTime());
-						ps.setString(15, sRoute.getDescriptions()==null ? "":sRoute.getDescriptions());
-						ps.setInt(16, sRoute.getDestroy());
-						ps.setInt(17, sRoute.getVersions());
-						ps.setInt(18, sRoute.getCreateBy()==null ? 0:sRoute.getCreateBy());
-						ps.setDate(19, new java.sql.Date(sRoute.getCreateDate().getTime()));
-						ps.setInt(20, sRoute.getUpdateBy()==null ? 0:sRoute.getUpdateBy());
-						ps.setDate(21, new java.sql.Date(sRoute.getUpdateDate().getTime()));						
+						ps.setInt(9, sRoute.getDirections());
+						ps.setDouble(10, sRoute.getDistances());
+						ps.setDouble(11, sRoute.getToTime());
+						ps.setInt(12, sRoute.getDestroy());
+						ps.setInt(13, sRoute.getVersions());
+						ps.setDate(14, new java.sql.Date(sRoute.getCreateDate().getTime()));
+						ps.setDate(15, new java.sql.Date(sRoute.getUpdateDate().getTime()));						
 					}
 					@Override
@@ -182,8 +174,8 @@ public class LineVersionsServiceImpl extends BaseServiceImpl&lt;LineVersions, Integ
     			jdbcTemplate.update("delete from bsth_c_sectionroute where line = ?  and line_code = ?", lineId, lineCode);
     			String sectionSql ="insert into bsth_c_sectionroute(id,line_code,section_code,sectionroute_code,"
-    					+ "directions,line,section,descriptions,create_by,create_date,update_by,update_date,versions,"
-    					+ "destroy,is_roade_speed) values(?,?,?,?,?,?,?,?,?,?,?,?,?,?,?)";
+    					+ "directions,line,section,create_date,update_date,versions,"
+    					+ "destroy) values(?,?,?,?,?,?,?,?,?,?,?)";
     			jdbcTemplate.batchUpdate(sectionSql, new BatchPreparedStatementSetter() {
 					@Override
@@ -196,14 +188,10 @@ public class LineVersionsServiceImpl extends BaseServiceImpl&lt;LineVersions, Integ
 						ps.setInt(5, sRoute.getDirections());
 						ps.setInt(6, sRoute.getLine().getId());
 						ps.setInt(7, sRoute.getSection().getId());
-						ps.setString(8, sRoute.getDescriptions()==null ? "":sRoute.getDescriptions());
-						ps.setInt(9, sRoute.getCreateBy()==null ? 0:sRoute.getCreateBy());
-						ps.setDate(10, new java.sql.Date(sRoute.getCreateDate().getTime()));
-						ps.setInt(11, sRoute.getUpdateBy()==null ? 0:sRoute.getUpdateBy());
-						ps.setDate(12, new java.sql.Date(sRoute.getUpdateDate().getTime()));
-						ps.setInt(13, sRoute.getVersions());
-						ps.setInt(14, sRoute.getDestroy());
-						ps.setInt(15, sRoute.getIsRoadeSpeed()==null ? 0:sRoute.getIsRoadeSpeed());
+						ps.setDate(8, new java.sql.Date(sRoute.getCreateDate().getTime()));
+						ps.setDate(9, new java.sql.Date(sRoute.getUpdateDate().getTime()));
+						ps.setInt(10, sRoute.getVersions());
+						ps.setInt(11, sRoute.getDestroy());
 					}
 					@Override
@@ -231,5 +219,10 @@ public class LineVersionsServiceImpl extends BaseServiceImpl&lt;LineVersions, Integ
 		}
     	return list;
 	}
+
+	@Override
+	public LineVersions findLineVersionsMax(int lineId) {
+		return repository.findLineVersionsMax(lineId);
+	}
 }
@@ -57,7 +57,7 @@
 							<p>
 								<span class="help-block" style="color: #1bbc9b;">
 									&nbsp;请在文本域中按顺序依次输坐标点,每行中的数据之间用【Tab】键隔开（如果是站点，请将在坐标后面加 stop;没有
-									stop默认是路段点）,每输入完一个坐标时请按回车键【Enter】换行. 例如：<!-- <br> 121.715623
+									stop默认是路段点，连续带stop的坐标认为是同一个站点）,每输入完一个坐标时请按回车键【Enter】换行. 例如：<!-- <br> 121.715623
 									31.224058 042408.000<br> 121.715623 31.224065 042409.000
 									Stop<br> 121.715623 31.224065 042410.000<br> -->
 									<br>121.511870	31.180638	043703.000
@@ -175,7 +175,7 @@ $(function(){
 			WorldsBMapLine.deleteCutSectionPoint(firstPoint);
 			WorldsBMapLine.setIsCutSection(false);
 		} else {
-			layer.msg("没有截取路段，不可以删除！！！");
+			layer.msg("没有截取路段，不可以撤销！！！");
 		}
 	});	
 	// 滚动轴监听事件
@@ -23,9 +23,9 @@
 				</form>
 			</div>
 			<div class="modal-footer">
-				<button type="button" class="btn default" data-dismiss="modal">取消</button>
 				<button type="button" class="btn btn-primary"
 					id="submitSelectnextButton">提交</button>
+				<button type="button" class="btn default" data-dismiss="modal">取消</button>
 			</div>
 		</div>
 	</div>
@@ -50,9 +50,9 @@
 				}
 				if(this.status==1){
 					//当前版本为默认
-					options += '<option value="'+this.versions+','+this.status+','+startDate+'"  > 版本'+this.versions+' 启用时间：'+startDate+' 当前版本</option>';
+					options += '<option value="'+this.versions+','+this.status+','+startDate+'" selected = "selected" > 版本'+this.versions+' 启用时间：'+startDate+' 当前版本</option>';
 				} else if(this.status==2){
-					options += '<option value="'+this.versions+','+this.status+','+startDate+'" selected = "selected"> 版本'+this.versions+' 启用时间：'+startDate+' 待更新版本</option>';
+					options += '<option value="'+this.versions+','+this.status+','+startDate+'"> 版本'+this.versions+' 启用时间：'+startDate+' 待更新版本</option>';
 				}
 			});
 			$('#lineVersions').html(options);
 <!-- 片段标题 START -->
 <div class="page-head">
 	<div class="page-title">
-		<h1>修改添加信息</h1>
+		<h1>添加线路版本</h1>
 	</div>
 </div>
 <!-- 片段标题 END -->
-<!-- 线路信息导航栏组件 START -->
+<!-- 线路版本信息导航栏组件 START -->
 <ul class="page-breadcrumb breadcrumb">
 	<li><a href="/pages/home.html" data-pjax>首页</a> <i class="fa fa-circle"></i></li>
 	<li><span class="active">基础信息</span> <i class="fa fa-circle"></i></li>
-	<li><a href="/pages/base/line/list.html" data-pjax>线路信息</a> <i class="fa fa-circle"></i></li>
+	<li><a href="/pages/base/lineversions/list.html" data-pjax>线路版本信息</a> <i class="fa fa-circle"></i></li>
 	<li><span class="active">修改添加信息</span></li>
 </ul>
-<!-- 线路信息导航栏组件 END -->
+<!-- 线路版本信息导航栏组件 END -->
 <!-- 信息容器组件 START -->
 <div class="portlet light bordered">
@@ -22,7 +22,7 @@
 	<div class="portlet-title">
 		<div class="caption">
 			<i class="icon-equalizer font-red-sunglo"></i> 
-			<span class="caption-subject font-red-sunglo bold uppercase">添加线路信息</span>
+			<span class="caption-subject font-red-sunglo bold uppercase">添加线路版本信息</span>
 		</div>
 	</div>
 	<!-- 信息容器组件标题 END -->
@@ -48,6 +48,17 @@
                  <!-- 表单分组组件 form-group START -->
 				<div class="form-group">
 						<label class="control-label col-md-5">
+          					<span class="required"> * </span>线路版本名称&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;:
+                    	</label>
+	                    <div class="col-md-4">
+	                     	<input name="name" class="form-control" style="width:100%" id="nameInput" placeholder="请填写更换版本原因，方便排班人员操作！" />
+	                    </div>
+                 </div>
+                 <!-- 表单分组组件 form-group END -->
+                 
+                 <!-- 表单分组组件 form-group START -->
+				<div class="form-group">
+						<label class="control-label col-md-5">
           					<span class="required"> * </span>线路名称&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;:
                     	</label>
 	                    <div class="col-md-4">
@@ -105,9 +116,9 @@
                  <!-- 表单分组组件 form-group START -->
                  <div class="form-group">
-					<label class="control-label col-md-5"> 描述/说明&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;: </label>
+					<label class="control-label col-md-5"> 描述/说明&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;: </label>
                    	<div class="col-md-4">
-                    		<textarea class="form-control" rows="3" name="remark" id="remarkTextarea" placeholder="请填写更换版本原因，方便排班人员操作！"></textarea>
+                    		<textarea class="form-control" rows="3" name="remark" id="remarkTextarea" placeholder="描述/说明"></textarea>
                    	</div>
                 </div>
                 <!-- 表单分组组件 form-group END -->
@@ -130,5 +141,5 @@
 </div>
 <!-- 信息容器组件 END -->
-<!-- 线路信息添加片段JS模块 -->
+<!-- 线路版本信息添加片段JS模块 -->
 <script src="/pages/base/lineversions/js/lineversions-add-from.js"></script>
 \ No newline at end of file
@@ -70,6 +70,9 @@
 			$('#lineIdInput').val('');// 设值线路ID.
 		}else {
 			var lineSelectValueArray = lineSelectValue.split('_');// 切割线路名称值.
+			$.get('/lineVersions/findLineVersionsMax',{'lineId':lineSelectValueArray[1]}, function(lineVersionsMax){
+				$('#versionsInput').val(++lineVersionsMax.versions);// 设值线路编码.
+			});
 			$('#lineIdInput').val(lineSelectValueArray[0]);// 设值线路编码.
 			$('#lineCodeInput').val(lineSelectValueArray[1]);// 设值线路ID.
 		}
@@ -110,6 +113,7 @@
 		focusInvalid : true, 
 		// 需要验证的表单元素
 		rules : {
+			'name' : {required : true,maxlength: 30},// 线路名称 必填项、最大长度.
 			'line' : {required : true,maxlength: 30},// 线路名称 必填项、最大长度.
 			'startDate' : {required : true},// 启用时间 不为空.
 			'endDate' : {required : true},// 结束时间.
@@ -124,6 +124,10 @@ $(&#39;#edit_select_mobal&#39;).on(&#39;editSelectMobal_show&#39;, function(e, map_,drw,ajaxd,ed
 				// 打开绘制工具
 				drw.openDrawingManager();
 				map_.localtionPoint(editStationName); 
+				layer.open({
+					  title: '友情提示'
+					  ,content: '重绘站点，会修改站点编码，影响已做好的排班和线路文件。请谨慎使用，谢谢！'
+					}); 
 			}else if(params.editselect==1){
 				// 弹出添加失败提示消息,2秒关闭（如果不配置，默认是3秒）
 				var mindex = layer.msg('编辑完图形后,请双击图形区域保存',{ offset: '126px',