Merge branch 'minhang' into pudong

潘钊
2 parents 7b28a574 020ed47d
Showing 11 changed files with 110 additions and 71 deletions
src/main/java/com/bsth/controller/oil/CwjyController.java
src/main/java/com/bsth/data/BasicData.java
src/main/java/com/bsth/data/gpsdata/arrival/handlers/InOutStationSignalHandle.java
src/main/java/com/bsth/data/schedule/thread/ScheduleRefreshThread.java
src/main/java/com/bsth/repository/LineRepository.java
src/main/java/com/bsth/service/gps/GpsServiceImpl.java
src/main/java/com/bsth/service/oil/impl/CwjyServiceImpl.java
src/main/java/com/bsth/websocket/handler/SendUtils.java
src/main/resources/static/pages/oil/jyszList.html
src/main/resources/static/real_control_v2/css/main.css
src/main/resources/static/real_control_v2/fragments/north/nav/all_devices.html
@@ -12,6 +12,7 @@ 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.controller.BaseController;
 import com.bsth.data.BasicData;
 import com.bsth.entity.Line;
@@ -35,7 +36,16 @@ public class CwjyController extends BaseController&lt;Cwjy, Integer&gt;{
 		t.setNbbm(t.getNbbm().trim().toUpperCase());
 		Line line=BasicData.nbbm2LineMap.get(t.getNbbm());
 		t.setLine(line == null?"" : line.getLineCode());
-		return service.save(t);
+		Map<String, Object> map = new HashMap<>();
+		try {
+		 map=service.save(t);
+		}catch (Exception e) {
+			// TODO: handle exception
+			if(e.getMessage().indexOf("PK_CWJYUK")>0){
+				map.put("fage", "存在相同数据,数据已经过滤");
+			}
+		}
+		return map;
 	}
 	@RequestMapping(value = "/checkNbbm",method = RequestMethod.GET)
@@ -257,7 +257,7 @@ public class BasicData {
          * @Description: TODO(加载线路相关信息)
          */
         public void loadLineInfo() {
-            Iterator<Line> iterator = lineRepository.findAll().iterator();
+            Iterator<Line> iterator = lineRepository.findAllService().iterator();
             Line line;
             BiMap<Integer, String> biMap = HashBiMap.create();
@@ -164,6 +164,9 @@ public class InOutStationSignalHandle extends SignalHandle{
             //实发时间
             sch.setFcsjActualAll(rsT);
             sch.setSiginCompate(1);
+
+            //出站既出场
+            outStationAndOutPark(sch);
             //通知客户端
             sendUtils.sendFcsj(sch);
             //持久化
@@ -172,12 +175,11 @@ public class InOutStationSignalHandle extends SignalHandle{
             //清理应发未发标记
             LateAdjustHandle.remove(sch);
-            if(!gps.isService()){
+            if(!gps.isService() && !dayOfSchedule.emptyService(sch)){
                 //切换成营运状态
                 gpsStatusManager.changeServiceState(sch.getClZbh(), sch.getXlDir(), 0, "发车@系统");
             }
-            //出站既出场
-            outStationAndOutPark(sch);
+
             logger.info("车辆：" + sch.getClZbh() + " 班次：" + sch.getDfsj() + "发车， 时间：" + sch.getFcsjActual());
         }
         else if(isOutSch(sch)){
@@ -252,31 +254,29 @@ public class InOutStationSignalHandle extends SignalHandle{
     private void outStationAndOutPark(ScheduleRealInfo sch){
-        LineConfig config = lineConfigData.get(sch.getXlBm());
-        //限定出站既出场的停车场
-        String park = config.getTwinsPark();
-        boolean limitPark = StringUtils.isNotEmpty(park);
-
-        if (config != null && config.getOutConfig() == 2) {
-            //出站既出场
-            ScheduleRealInfo schPrev = dayOfSchedule.prev(sch);
-            if (schPrev != null && schPrev.getBcType().equals("out") && (schPrev.getBcsj()==0 || schPrev.getJhlcOrig().intValue()==0)
-                    && (!limitPark || park.equals(schPrev.getQdzCode()))) {
-
-                schPrev.setFcsjActualAll(sch.getFcsjActualTime());
-                schPrev.setZdsjActualAll(sch.getFcsjActualTime());
-
-                sendUtils.refreshSch(schPrev);
-                dayOfSchedule.save(schPrev);
-
-                /*if(schPrev.getBcType().equals("out")){
-                    //出场时，切换成营运状态
-                    String deviceId = BasicData.deviceId2NbbmMap.inverse().get(sch.getClZbh());
-                    gpsStatusManager.changeServiceState(deviceId, schPrev.getXlDir(), 0, "出场@系统");
-                    //DirectivePushQueue.put6003(schPrev.getClZbh(), 0, Integer.parseInt(schPrev.getXlDir()), "出场@系统");
-                    //directiveService.send60Operation(schPrev.getClZbh(), 0, Integer.parseInt(schPrev.getXlDir()), null, "出场@系统");
-                }*/
+        try{
+            LineConfig config = lineConfigData.get(sch.getXlBm());
+            //限定出站既出场的停车场
+            String park = config.getTwinsPark();
+            boolean limitPark = StringUtils.isNotEmpty(park);
+
+            if (config != null && config.getOutConfig() == 2) {
+                //出站既出场
+                ScheduleRealInfo schPrev = dayOfSchedule.prev(sch);
+                if (schPrev != null && schPrev.getBcType().equals("out") && (schPrev.getBcsj()==0 || schPrev.getJhlcOrig().intValue()==0)
+                        && (!limitPark || park.equals(schPrev.getQdzCode()))) {
+
+                    schPrev.setFcsjActualAll(sch.getFcsjActualTime());
+                    schPrev.setZdsjActualAll(sch.getFcsjActualTime());
+                    //起点实到
+                    sch.setQdzArrDatesj(schPrev.getZdsjActual());
+
+                    sendUtils.refreshSch(schPrev);
+                    dayOfSchedule.save(schPrev);
+                }
             }
+        }catch (Exception e){
+            logger.error("", e);
         }
     }
@@ -343,9 +343,6 @@ public class InOutStationSignalHandle extends SignalHandle{
             if(lpNext != null){
                 lpNext.setQdzArrDatesj(sch.getZdsjActual());
             }
-            else{
-                logger.info(sch.getClZbh() + " 到终点，无下一班");
-            }
             //通知客户端
             sendUtils.sendZdsj(sch, lpNext, doneSum);
@@ -361,11 +358,12 @@ public class InOutStationSignalHandle extends SignalHandle{
                 if(!next.getXlBm().equals(sch.getXlBm())){
                     gpsStatusManager.changeLine(next.getClZbh(), next.getXlBm(), "套跑@系统");
                 }
-            }
-            else if(sch.getBcType().equals("in")){
-                //进场，切换成非营运状态
-                gpsStatusManager.changeServiceState(sch.getClZbh(), sch.getXlDir(), 1, "进场@系统");
-            }
+
+                //下一个班次是空驶班次
+                if(dayOfSchedule.emptyService(next))
+                    nonService(sch, "空驶@系统");
+            } else
+                nonService(sch, "结束@系统");
         }
         else {
             /*if(sch.getFcsjActual() == null){
@@ -466,7 +464,7 @@ public class InOutStationSignalHandle extends SignalHandle{
                 dayOfSchedule.addExecPlan(next);
             //进场，切换成非营运状态
-            gpsStatusManager.changeServiceState(sch.getClZbh(), sch.getXlDir(), 1, "进场@系统");
+            nonService(sch, "进场@系统");
         }
     }
@@ -522,4 +520,13 @@ public class InOutStationSignalHandle extends SignalHandle{
     private boolean isInSch(ScheduleRealInfo sch){
         return sch.getBcType().equals("in") || GeoCacheData.tccMap.keySet().contains(sch.getZdzCode());
     }
+
+    /**
+     * 切换为非营运状态
+     * @param sch
+     * @param sender
+     */
+    private void nonService(ScheduleRealInfo sch, String sender){
+        gpsStatusManager.changeServiceState(sch.getClZbh(), sch.getXlDir(), 1, sender);
+    }
 }
 \ No newline at end of file
@@ -49,25 +49,34 @@ public class ScheduleRefreshThread extends Thread{
 			Collection<LineConfig> confs = lineConfs.getAll();
 			String currSchDate, oldSchDate;
-			String lineCode;
+			String lineCode = null;
 			for(LineConfig conf : confs){
-				lineCode = conf.getLine().getLineCode();
-				oldSchDate = dayOfSchedule.getCurrSchDate().get(lineCode);
-				currSchDate = dayOfSchedule.calcSchDate(lineCode);
-				
-				if(oldSchDate == null || !oldSchDate.equals(currSchDate)){
+				try{
+					lineCode = conf.getLine().getLineCode();
+					oldSchDate = dayOfSchedule.getCurrSchDate().get(lineCode);
+					currSchDate = dayOfSchedule.calcSchDate(lineCode);
-					logger.info(lineCode + "开始翻班， " + currSchDate);
-					//清除指令数据
-					Set<String> cars = dayOfSchedule.findCarByLineCode(lineCode);
-					for(String car : cars)
-						dayOfDirectives.clear(BasicData.deviceId2NbbmMap.inverse().get(car));
-					//清除驾驶员上报数据
-					pilotReport.clear(lineCode);
-					
-					//重载排班数据
-					dayOfSchedule.reloadSch(lineCode, currSchDate, false);
-					logger.info(lineCode + "翻班完成， " + currSchDate + " -班次数量：" + dayOfSchedule.findByLineCode(lineCode).size());
+					if(oldSchDate == null || !oldSchDate.equals(currSchDate)){
+
+						logger.info(lineCode + "开始翻班， " + currSchDate);
+
+						try{
+							//清除指令数据
+							Set<String> cars = dayOfSchedule.findCarByLineCode(lineCode);
+							for(String car : cars)
+								dayOfDirectives.clear(BasicData.deviceId2NbbmMap.inverse().get(car));
+							//清除驾驶员上报数据
+							pilotReport.clear(lineCode);
+						}catch (Exception e){
+							logger.error("清理 60 和 80出现问题", e);
+						}
+
+						//重载排班数据
+						dayOfSchedule.reloadSch(lineCode, currSchDate, false);
+						logger.info(lineCode + "翻班完成， " + currSchDate + " -班次数量：" + dayOfSchedule.findByLineCode(lineCode).size());
+					}
+				}catch (Exception e){
+					logger.error("班次更新失败！！ -" + lineCode, e);
 				}
 			}
@@ -41,4 +41,7 @@ public interface LineRepository extends BaseRepository&lt;Line, Integer&gt; {
 	@Query(value = "  SELECT l FROM Line l where l.company like %?1% and l.brancheCompany like %?2% and l.lineCode like ?3")
 	public List<Line> findLineBygsBm(String gsBm, String fgsBm, String line);
+
+	@Query("SELECT L FROM Line L where L.destroy=0")
+	List<Line> findAllService();
 }
@@ -16,8 +16,6 @@ import com.bsth.repository.StationRepository;
 import com.bsth.repository.realcontrol.ScheduleRealInfoRepository;
 import com.bsth.service.gps.entity.*;
 import com.bsth.util.DateUtils;
-import com.bsth.util.PageHelper;
-import com.bsth.util.PageObject;
 import com.bsth.util.TransGPS;
 import com.bsth.util.TransGPS.Location;
 import com.bsth.util.db.DBUtils_MS;
@@ -985,11 +983,18 @@ public class GpsServiceImpl implements GpsService {
     public boolean fieldEquals(List<Field> fs, Object obj, Map<String, Object> map) {
         try {
+            String fv, v;
             for (Field f : fs) {
                 if (StringUtils.isEmpty(map.get(f.getName()).toString()))
                     continue;
-                if (f.get(obj) == null || f.get(obj).toString().indexOf(map.get(f.getName()).toString()) == -1)
+                if(f.get(obj) == null)
+                    return false;
+
+                fv = f.get(obj).toString();
+                v = map.get(f.getName()).toString();
+
+                if(!fv.startsWith(v) && !fv.endsWith(v))
                     return false;
             }
         } catch (Exception e) {
@@ -393,5 +393,7 @@ public class CwjyServiceImpl extends BaseServiceImpl&lt;Cwjy,Integer&gt; implements Cw
 		return cs;
 	}
+	
+	
 }
@@ -36,8 +36,6 @@ public class SendUtils{
 	 *             TODO(推送发车信息)
 	 */
 	public void sendFcsj(ScheduleRealInfo sch) {
-		//处理出站即出场的班次
-		//connectOutSchTime(sch);
 		Map<String, Object> map = new HashMap<>();
 		map.put("fn", "faChe");
@@ -115,7 +115,8 @@
 	<td>{{obj.xgr}}</td>
 	<td>{{obj.createDate}}</td>
 	<td>
-		<!--<a class="btn btn-sm blue btn-outline" href="edit.html?no={{obj.id}}" data-pjax><i class="fa fa-edit"></i> 编辑</a>-->
+		<button type="button" class="btn btn-sm blue btn-jyszList" 
+			data-id="{{obj.id}}">删除</button>
 	</td>
 </tr>
 {{/each}}
@@ -241,9 +242,7 @@ $(function(){
 			$.each(data.content, function(i, obj) {
                 obj.createDate = moment(obj.createDate).format("YYYY-MM-DD");
             });
-			console.log(data.content);
 			var bodyHtm = template('jysz_list_temp', {list: data.content});
-			
 			$('#datatable_jysz tbody').html(bodyHtm)
 					.find('.icheck').iCheck(icheckOptions)
 					.on('ifChanged', iCheckChange);
@@ -252,6 +251,7 @@ $(function(){
 				initPagination = true;
 				showPagination(data);
 			}
+			$('.btn-jyszList').on('click', remJysz);
 			layer.close(i);
 		});
 	}
@@ -302,9 +302,14 @@ $(function(){
 		    }
 		});
 	}
-	
-	
 	//删除
+	function remJysz(){
+		var id = $(this).data('id');
+		removeConfirm('确定要删除选中的数据？', '/cwjy/' + id ,function(){
+			$('tr.filter .filter-submit').click();
+		});
+	}
+	/* 
 	$('#removeButton').on('click', function(){
 		if($(this).attr('disabled'))
 			return;
@@ -314,7 +319,7 @@ $(function(){
 		removeConfirm('确定要删除选中的数据？', '/resource/' + id ,function(){
 			$('tr.filter .filter-submit').click();
 		});
-	});
+	}); */
 	$('#addJysz').on('click', function(){
@@ -271,7 +271,7 @@ svg.line-chart g.merge-item text {
 }
 .qtip-multi-gps {
-    max-width: 716px !important;
+    max-width: 720px !important;
 }
 .qtip-bootstrap.qtip-multi-gps .qtip-content {
@@ -7,12 +7,12 @@
         <div class="uk-panel uk-panel-box uk-panel-box-primary">
             <form class="uk-form search-form">
                 <fieldset data-uk-margin>
-                    <legend>
+                    <!--<legend>
                         数据检索
-                        <!-- <div class="legend-tools">
+                        &lt;!&ndash; <div class="legend-tools">
                     <a class="uk-icon-small uk-icon-hover uk-icon-file-excel-o" data-uk-tooltip title="导出excel"></a>
-                  </div> -->
-                    </legend>
+                  </div> &ndash;&gt;
+                    </legend>-->
                     <span class="horizontal-field">线路</span>
                     <div class="uk-autocomplete uk-form autocomplete-line" >
                         <input type="text" name="lineId" placeholder="线路">