线路添加删除功能..

潘钊
1 parent 57d776b7
Showing 11 changed files with 159 additions and 33 deletions
src/main/java/com/bsth/controller/LineController.java
src/main/java/com/bsth/entity/Line.java
src/main/java/com/bsth/service/LineService.java
src/main/java/com/bsth/service/impl/LineServiceImpl.java
src/main/java/com/bsth/service/realcontrol/impl/ScheduleRealInfoServiceImpl.java
src/main/resources/static/pages/base/line/js/line-list-table.js
src/main/resources/static/pages/base/line/list.html
src/main/resources/static/real_control_v2/css/main.css
src/main/resources/static/real_control_v2/fragments/home/tooltip.html
src/main/resources/static/real_control_v2/js/line_schedule/sch_table.js
src/main/resources/static/real_control_v2/mapmonitor/js/playback.js
 package com.bsth.controller;
-import java.text.ParseException;
-import java.text.SimpleDateFormat;
-import java.util.Date;
-import java.util.HashMap;
-import java.util.Map;
-
-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 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;
+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.text.ParseException;
+import java.text.SimpleDateFormat;
+import java.util.Date;
+import java.util.HashMap;
+import java.util.Map;
 /**
  * 
@@ -123,4 +122,14 @@ public class LineController extends BaseController&lt;Line, Integer&gt; {
 	Line findByID(@RequestParam(defaultValue = "id") Integer id){
 		return service.findById(id);
 	}
+
+	/**
+	 * 删除线路
+	 * @param id
+	 * @return
+	 */
+	@RequestMapping(value ="/remove" , method = RequestMethod.POST)
+	public Map<String, Object> remove(Integer id){
+		return service.remove(id);
+	}
 }
@@ -160,6 +160,11 @@ public class Line implements Serializable {
 	/** 是否在使用 <1:是;0:否> bit length(50) */
 	private Integer inUse;
+
+	/**
+	 * 逻辑删除标记 为 1：标识已删除
+	 */
+	private Integer remove;
 	public Integer getSpacGrade() {
 		return spacGrade;
@@ -492,6 +497,13 @@ public class Line implements Serializable {
 	public void setSfyy(Integer sfyy) {
 		this.sfyy = sfyy;
 	}
-    
-    
+
+
+	public Integer getRemove() {
+		return remove;
+	}
+
+	public void setRemove(Integer remove) {
+		this.remove = remove;
+	}
 }
 package com.bsth.service;
-import java.util.Map;
-
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RequestMethod;
-
 import com.bsth.entity.Line;
+import java.util.Map;
+
 /**
  * 
  * @Interface: LineService(线路service业务层实现接口)
@@ -38,4 +35,6 @@ public interface LineService extends BaseService&lt;Line, Integer&gt; {
 	String lineCodeVerification(String lineCode);
 	Map<String, Object> update(Line l);
+
+    Map<String,Object> remove(Integer id);
 }
 package com.bsth.service.impl;
-import java.util.HashMap;
-import java.util.Map;
-
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.stereotype.Service;
-import org.springframework.transaction.annotation.Transactional;
-
 import com.bsth.common.ResponseCode;
 import com.bsth.entity.Line;
 import com.bsth.repository.LineRepository;
 import com.bsth.service.LineService;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.jdbc.core.JdbcTemplate;
+import org.springframework.stereotype.Service;
+import org.springframework.transaction.annotation.Transactional;
+
+import java.util.HashMap;
+import java.util.Map;
 /**
  * 
@@ -34,6 +34,9 @@ public class LineServiceImpl extends BaseServiceImpl&lt;Line, Integer&gt; implements L
 	@Autowired
 	private LineRepository repository;
+	@Autowired
+	JdbcTemplate jdbcTemplate;
+
 	/**
 	 * 获取线路编码
 	 * 
@@ -86,4 +89,32 @@ public class LineServiceImpl extends BaseServiceImpl&lt;Line, Integer&gt; implements L
 		return map;
 	}
+	@Override
+	public Map<String, Object> remove(Integer id) {
+		Map<String, Object> map = new HashMap<>();
+
+		try{
+			if(null == id){
+				map.put("status", ResponseCode.ERROR);
+				map.put("msg", "参数异常");
+				return map;
+			}
+
+			int destroy = jdbcTemplate.queryForObject("select destroy from bsth_c_line where id=" + id, Integer.class);
+
+			if(destroy==0){
+				map.put("status", ResponseCode.ERROR);
+				map.put("msg", "你只能删除已撤销的线路！");
+				return map;
+			}
+
+			jdbcTemplate.update("update bsth_c_line set `remove`=1 where id=?", id);
+			map.put("status", ResponseCode.SUCCESS);
+		}catch (Exception e){
+			logger.error("", e);
+			map.put("status", ResponseCode.ERROR);
+			map.put("msg", e.getMessage());
+		}
+		return map;
+	}
 }
@@ -1234,7 +1234,7 @@ public class ScheduleRealInfoServiceImpl extends BaseServiceImpl&lt;ScheduleRealInf
             ScheduleModifyLogger.sftz(sch, fcsjActual, remarks);
             sch.setFcsjActualAll(fcsjActual);
-            sch.addRemarks(remarks);
+            sch.setRemark(remarks);
             sch.calcStatus();
             //if(sch.isLate2()){
                 //取消应发未到标记
@@ -180,6 +180,7 @@
 		params['order'] = 'id';
 		// 记录当前页数
 		params['page'] = page;
+		params['remove_ne'] = 1;
 		// 弹出正在加载层
 		var i = layer.load(2);
 		getComp(function(rs) {
 <!-- <link href="/pages/base/line/css/animate.css" rel="stylesheet" type="text/css" />
 <link href="/pages/base/line/css/tipso.css" rel="stylesheet" type="text/css" /> -->
 <!-- 片段标题 START -->
+<style>
+	a.ct_base_line_delete_link{
+		font-size: 12px;
+		color: red;
+		vertical-align: bottom;
+		display: inline-block;
+		margin-left: 5px;
+		text-decoration: underline;
+	}
+
+	a.ct_base_line_delete_link:hover{
+		color: #d11608;
+	}
+</style>
 <div class="page-head">
 	<div class="page-title">
 		<h1>线路信息</h1>
@@ -355,6 +369,10 @@
 			<td>
 				<a href="details.html?no={{obj.id}}" class="btn default blue-stripe btn-sm" data-pjax> 详细 </a>
 				<a href="edit.html?no={{obj.id}}" class="btn default blue-stripe btn-sm" data-pjax> 修改 </a>
+
+				{{if obj.destroy==1}}
+				<a class="ct_base_line_delete_link" data-id="{{obj.id}}" data-name="{{obj.name}}"> 删除 </a>
+				{{/if}}
 			</td>
 		</tr>
 	{{/each}}
@@ -365,4 +383,23 @@
 	{{/if}}
 </script>
 <!-- 线路信息片段JS模块 -->
-<script src="/pages/base/line/js/line-list-table.js"></script>
 \ No newline at end of file
+<script src="/pages/base/line/js/line-list-table.js"></script>
+<script>
+	(function () {
+		$(document).on('click', 'a.ct_base_line_delete_link', function () {
+			var id = $(this).data('id'),
+					name = $(this).data('name');
+
+			layer.confirm('你确定要删除线路【'+name+'】？', {
+				btn: ['确定删除','取消'] //按钮
+			}, function(){
+				layer.msg('操作中...', {icon: 16,shade: 0.01});
+				$post('/line/remove', {id: id}, function (rs) {
+					layer.msg('删除成功！');
+					$('.filter-submit.margin-bottom').trigger('click');
+				});
+
+			});
+		});
+	})();
+</script>
 \ No newline at end of file
@@ -338,6 +338,9 @@ svg.line-chart g.merge-item text {
 .tooltip span.field {
     color: #7d7d7b;
     margin-right: 5px;
+    width: 52px;
+    display: inline-block;
+    text-align: right;
 }
 .tooltip .tip_map_wrap {
@@ -2026,4 +2029,10 @@ dl.active &gt; dd.disabled {
     100% {
         background: rgba(254, 235, 69, 0.38);
     }
+}
+
+.home_svg_tips>div{
+    overflow: hidden;
+    text-overflow: ellipsis;
+    white-space: nowrap;
 }
 \ No newline at end of file
@@ -3,7 +3,7 @@
       <div class="tooltip" data-id="{{deviceId}}">
         <div class="tooltip-container">
-            <div class="cont-text-panel">
+            <div class="cont-text-panel home_svg_tips">
                 <div class="title">
                     <a href="javascript:;" data-for="station" class="tip_modal">
                         {{nbbm}}
@@ -21,7 +21,7 @@
                 <div>
                     <span class="field">车牌号：</span>{{plateNo}}
                 </div>
-                <div>
+                <div title="{{stationName}}">
                     <span class="field">站点：</span>{{stationName}}
                 </div>
                 <!-- <div>
@@ -30,9 +30,19 @@
                 <div>
                     <span class="field">设备：</span>{{deviceId}}
                 </div>
-                <div>
+                <!--<div>
                     <span class="field">坐标：</span>{{lon}} {{lat}}
-                </div>
+                </div>-->
+                {{if sch!=null}}
+                    <div>
+                        <span class="field">驾驶员：</span>{{sch.jGh}}/{{sch.jName}}
+                    </div>
+                    {{if sch.sGh!=null && sch.sGh!=""}}
+                        <div>
+                            <span class="field">售票员：</span>{{sch.sGh}}/{{sch.sName}}
+                        </div>
+                    {{/if}}
+                {{/if}}
                 <div>
                     <span class="field">速度：</span>{{speed>99?'..':speed}}</div>
                 <div>
@@ -472,6 +472,11 @@ var gb_schedule_table = (function () {
             //滚动到下一个班次
             scroToDl(nextSch);
         }
+
+        //如果有打开轨迹回放
+        if($('.layui-layer.play_back-layer').is(':visible')){
+            gb_map_play_back.setParam(sch);
+        }
     });
     //路牌点击
@@ -10,6 +10,18 @@ var gb_map_play_back = (function () {
         dom = rs;
     });
+    var setParam = function (sch) {
+        console.log('sch', sch);
+        var f = $('.play-back-form form'),
+            st = (sch['fcsjActualTime']?sch['fcsjActualTime']:sch['dfsjT']) - 1000 * 60 * 5,
+            et = (sch['zdsjActualTime']?sch['zdsjActualTime']:sch['zdsjT']) + 1000 * 60 * 5,
+            fs = 'YYYY-MM-DD HH:mm';
+
+        $('[name=nbbm]', f).val(sch.clZbh);
+        $('[name=startTime]', f).val(moment(st).format(fs));
+        $('[name=endTime]', f).val(moment(et).format(fs));
+    };
+
     var initParams = function (deviceId, nbbm) {
         //关闭infowindow
         if (deviceId)
@@ -96,6 +108,7 @@ var gb_map_play_back = (function () {
     return {
         initParams: initParams,
-        listToExcel: listToExcel
+        listToExcel: listToExcel,
+        setParam: setParam
     }
 })();
 \ No newline at end of file