update...

潘钊
1 parent 8a1112e3
Showing 4 changed files with 27 additions and 42 deletions
src/main/java/com/bsth/data/directive/DirectivesPstThread.java
src/main/java/com/bsth/entity/directive/D60.java
src/main/java/com/bsth/service/realcontrol/impl/ScheduleRealInfoServiceImpl.java
src/main/java/com/bsth/websocket/handler/RealControlSocketHandler.java
 package com.bsth.data.directive;
  
+import com.bsth.data.schedule.DayOfSchedule;
 import com.bsth.entity.directive.D60;
 import com.bsth.entity.directive.D64;
 import com.bsth.entity.directive.Directive;
+import com.bsth.entity.realcontrol.ScheduleRealInfo;
 import com.bsth.repository.directive.D60Repository;
 import com.bsth.repository.directive.D64Repository;
 import org.slf4j.Logger;
@@ -27,6 +29,9 @@ public class DirectivesPstThread extends Thread {
     @Autowired
     D64Repository d64Repository;
  
+    @Autowired
+    DayOfSchedule dayOfSchedule;
+
     @Override
     public void run() {
         LinkedList<Directive> list = DayOfDirectives.pstDirectives;
@@ -37,7 +42,14 @@ public class DirectivesPstThread extends Thread {
                 directive = list.poll();
  
                 if (directive instanceof D60) {
-                    d60Repository.save((D60) directive);
+                    D60 d60 = (D60) directive;
+                    if(d60.isDispatch()){
+                        ScheduleRealInfo sch = d60.getSch();
+                        //如果关联的班次已经不存在了，放弃入库
+                        if(dayOfSchedule.get(sch.getId()) == null)
+                            continue;
+                    }
+                    d60Repository.save(d60);
                 }
  
                 if (directive instanceof D64) {
 package com.bsth.entity.directive;
  
-import javax.persistence.Embeddable;
-import javax.persistence.Entity;
-import javax.persistence.FetchType;
-import javax.persistence.GeneratedValue;
-import javax.persistence.Id;
-import javax.persistence.ManyToOne;
-import javax.persistence.NamedAttributeNode;
-import javax.persistence.NamedEntityGraph;
-import javax.persistence.NamedEntityGraphs;
-import javax.persistence.Table;
-import javax.persistence.Transient;
-
 import com.bsth.entity.realcontrol.ScheduleRealInfo;
 import com.fasterxml.jackson.annotation.JsonIgnore;
  
+import javax.persistence.*;
+
  
 /**
  * @author PanZhao
@@ -75,7 +65,7 @@ public class D60 extends Directive {
      * 相关联的班次
      */
     @JsonIgnore
-    @ManyToOne(fetch = FetchType.LAZY)
+    @ManyToOne(fetch = FetchType.LAZY, cascade = CascadeType.REFRESH)
     private ScheduleRealInfo sch;
  
     public Long getReply46Time() {
@@ -624,12 +624,12 @@ public class ScheduleRealInfoServiceImpl extends BaseServiceImpl&lt;ScheduleRealInf
             //数据库删除
             rs = super.delete(id);
             if(rs.get("status").equals(ResponseCode.SUCCESS)){
-                ScheduleRealInfo temp = super.findById(id);
+                /*ScheduleRealInfo temp = super.findById(id);
                 if(temp != null){
                     rs.put("status", ResponseCode.ERROR);
                     rs.put("msg", "删除失败，请重试！");
                     return rs;
-                }
+                }*/
  
                 dayOfSchedule.delete(sch);
                 //更新起点应到时间
@@ -6,29 +6,29 @@ import com.bsth.data.BasicData;
 import com.google.common.base.Splitter;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
-import org.springframework.context.annotation.Scope;
 import org.springframework.stereotype.Component;
 import org.springframework.web.socket.*;
  
-import java.util.*;
+import java.util.ArrayList;
+import java.util.Collection;
+import java.util.Iterator;
+import java.util.List;
 import java.util.concurrent.ConcurrentHashMap;
+import java.util.concurrent.CopyOnWriteArrayList;
  
 /**
  * @author PanZhao
  */
 @Component
-@Scope("prototype")
 public class RealControlSocketHandler implements WebSocketHandler {
  
 	Logger logger = LoggerFactory.getLogger(this.getClass());
  
 	private static ArrayList<WebSocketSession> users;
-	//private static final ArrayListMultimap<String, WebSocketSession> listenMap;
-	private static ConcurrentHashMap<String, List<WebSocketSession>> listenMap;
+	private static ConcurrentHashMap<String, CopyOnWriteArrayList<WebSocketSession>> listenMap;
  
 	static {
 		users = new ArrayList<WebSocketSession>();
-		//listenMap = ArrayListMultimap.create();
 		listenMap = new ConcurrentHashMap();
 	}
  
@@ -37,30 +37,13 @@ public class RealControlSocketHandler implements WebSocketHandler {
 			throws Exception {
 		users.remove(session);
 		//清理监听
-		//Set<String> keys = listenMap.keySet();
-		//Map<String, WebSocketSession> remMap = new HashMap<>();
-
 		int vsCount=0;
-		Collection<List<WebSocketSession>> vs = listenMap.values();
-		for(List<WebSocketSession> list : vs){
+		Collection<CopyOnWriteArrayList<WebSocketSession>> vs = listenMap.values();
+		for(CopyOnWriteArrayList<WebSocketSession> list : vs){
 			list.remove(session);
  
 			vsCount += list.size();
 		}
-		/*List<WebSocketSession> vs;
-		for(String k : keys){
-			//vs = listenMap.get(k);
-			//vs.remove(session);
-			listenMap.get(k).remove()
-			*//*if(listenMap.get(k).contains(session))
-				remMap.put(k, session);*//*
-		}*/
-
-		/*Set<String> remSet = remMap.keySet();
-		for(String k : remSet){
-			listenMap.remove(k, remMap.get(k));
-			logger.info("web socket close, remove listen K: "+ k);
-		}*/
 		logger.info("listen values size: " + vsCount + " -CloseStatus:" + arg1);
 	}
  
@@ -81,7 +64,7 @@ public class RealControlSocketHandler implements WebSocketHandler {
 				for(String lineCode : idx){
 					if(BasicData.lineCode2NameMap.containsKey(lineCode)){
 						if(!listenMap.containsKey(lineCode)){
-							listenMap.put(lineCode, new ArrayList<WebSocketSession>());
+							listenMap.put(lineCode, new CopyOnWriteArrayList<WebSocketSession>());
 						}
 						listenMap.get(lineCode).add(session);
 					}