Merge branch 'minhang' of http://222.66.0.204:8090//panzhaov5/bsth_control into minhang

徐烜
2 parents e249d19c 3fe3cf97
Showing 7 changed files with 49 additions and 39 deletions
src/main/java/com/bsth/controller/report/SheetController.java
src/main/java/com/bsth/data/gpsdata/arrival/utils/SignalSchPlanMatcher.java
src/main/java/com/bsth/data/msg_queue/WebSocketPushQueue.java
src/main/java/com/bsth/data/schedule/thread/CalcOilThread.java
src/main/java/com/bsth/repository/sheet/SheetRepository.java
src/main/java/com/bsth/service/report/SheetService.java
src/main/java/com/bsth/service/report/impl/SheetServiceImpl.java
@@ -19,10 +19,10 @@ public class SheetController  extends BaseController&lt;Sheet, Integer&gt;{
 	@Autowired
 	SheetService sheetService;
 	@RequestMapping(value = "/saveListSheet",method = RequestMethod.POST)
-	public String saveListSheet(){
+	public String saveListSheet(@RequestParam String date){
 		String result="";
 		try {
-			result = sheetService.saveSheetList();
+			result = sheetService.saveSheetList(date);
 		} catch (Exception e) {
 			// TODO Auto-generated catch block
 			e.printStackTrace();
@@ -33,10 +33,10 @@ public class SignalSchPlanMatcher {
         try{
             //会不会是分班没有完成
-            if(sch.getBcType().equals("in")){
+            if(sch.getBcType().equals("in") && t - sch.getDfsjT() > 1000 * 60 * 20){
                 ScheduleRealInfo fbFirst = dayOfSchedule.nextByBcType(sch, "normal");
-                if(fbFirst == null)
+                if(fbFirst == null || !fbFirst.getQdzCode().equals(outSigal.getStopNo()))
                     return;
                 long dt = fbFirst.getDfsjT();
@@ -36,6 +36,7 @@ public class WebSocketPushQueue implements CommandLineRunner {
         qd.setMessage(msg);
         qd.setSession(session);
+
         log.info("put、[" + session.getAttributes().get(Constants.SESSION_USERNAME) + "] 、" + msg.getPayload());
         linkedList.add(qd);
     }
@@ -70,7 +71,7 @@ public class WebSocketPushQueue implements CommandLineRunner {
                         sleepFlag = false;
                         session = qd.getSession();
                         if (session.isOpen()) {
-                            log.info("push start、[" + session.getAttributes().get(Constants.SESSION_USERNAME) + "] 、" + qd.getMessage().getPayload());
+                            log.info("push start、"+session.getRemoteAddress().getHostString()+"[" + session.getAttributes().get(Constants.SESSION_USERNAME) + "] 、" + qd.getMessage().getPayload());
                             session.sendMessage(qd.getMessage());
                             log.info("push end..");
                         }
@@ -34,7 +34,7 @@ public class CalcOilThread extends Thread{
             dlbService.obtainDsq();
             logger.info("计算路单里程加注量结束！");
             logger.info("开始计算班次准点率....");
-            sheetService.saveSheetList();
+            sheetService.saveSheetList("");
             logger.info("计算班次准点率结束！");
             //清除安全驾驶数据 先临时蹭这个线程
             SafeDrivCenter.clear();
@@ -2,6 +2,8 @@ package com.bsth.repository.sheet;
 import com.bsth.entity.sheet.Sheet;
 import com.bsth.repository.BaseRepository;
+
+import org.springframework.data.jpa.repository.Query;
 import org.springframework.stereotype.Repository;
 /**
@@ -9,4 +11,6 @@ import org.springframework.stereotype.Repository;
  */
 @Repository
 public interface SheetRepository extends BaseRepository<Sheet, Integer>{
+	@Query(value = "select count(*) from Sheet s where s.date = ?1")
+	int countByDate(String date);
 }
@@ -8,7 +8,7 @@ import com.bsth.service.BaseService;
 public interface SheetService extends BaseService<Sheet, Integer>{
 	public List<Map<String, Object>> bcPunctual(Map<String, Object> map);
-	public String  saveSheetList() throws Exception;
+	public String  saveSheetList(String date) throws Exception;
 	public List<Map<String, Object>> countList(Map<String, Object> map);
 	public List<Sheet> sheetList(Integer id);
@@ -82,48 +82,53 @@ public class SheetServiceImpl extends BaseServiceImpl&lt;Sheet, Integer&gt; implements
 		return fage;
 	}
 	@Override
-	public String saveSheetList() throws Exception{
+	public String saveSheetList(String rq) throws Exception{
 		Map<String, Object> map=new HashMap<String,Object>();
 		String result = "failure";
+		
 		try {
 			SimpleDateFormat sdf=new SimpleDateFormat("yyyy-MM-dd");
-			Date dNow = new Date();   //当前时间
-			Calendar calendar = Calendar.getInstance(); //得到日历
-			calendar.setTime(dNow);//把当前时间赋给日历
-			calendar.add(Calendar.DAY_OF_MONTH, -3);  //设置为前三天
-			    
-			String rq=sdf.format(calendar.getTime());
-//			String rq="2017-05-16";
-			
-			List<Line> lineList = (List<Line>) lineRepository.findAll();
-			List<ScheduleRealInfo> lists= scheduleRealInfoRepository.findByDate(rq);
-			List<Sheet> listAdds=new ArrayList<Sheet>();
-			for (int i = 0; i < lineList.size(); i++) {
-				List<ScheduleRealInfo> list=new ArrayList<ScheduleRealInfo>();
-				String line=lineList.get(i).getLineCode();
-				for (int j = 0; j < lists.size(); j++) {
-					ScheduleRealInfo s=lists.get(j);
-					if(!isInOut(s)){
-						if(s.getXlBm().equals(line)){
-							list.add(s);
+			   if(rq.equals("")){
+				   Date dNow = new Date();   //当前时间
+				   Calendar calendar = Calendar.getInstance(); //得到日历
+				   calendar.setTime(dNow);//把当前时间赋给日历
+				   calendar.add(Calendar.DAY_OF_MONTH, -3);  //设置为前三天
+				   rq=sdf.format(calendar.getTime());
+			   } 
+			   int count=sheetRepository.countByDate(rq);
+			   if(count<=0){
+				List<Line> lineList = (List<Line>) lineRepository.findAll();
+				
+				List<ScheduleRealInfo> lists= scheduleRealInfoRepository.findByDate(rq);
+				List<Sheet> listAdds=new ArrayList<Sheet>();
+				for (int i = 0; i < lineList.size(); i++) {
+					List<ScheduleRealInfo> list=new ArrayList<ScheduleRealInfo>();
+					String line=lineList.get(i).getLineCode();
+					for (int j = 0; j < lists.size(); j++) {
+						ScheduleRealInfo s=lists.get(j);
+						if(!isInOut(s)){
+							if(s.getXlBm().equals(line)){
+								list.add(s);
+							}
 						}
 					}
-					
-				}
-				if(list.size()>0){
-					List<Sheet> listAdd=punctualByLine(line,list);
-					if(listAdd.size()>0){ 
-						listAdds.addAll(listAdd);
+					if(list.size()>0){
+						List<Sheet> listAdd=punctualByLine(line,list);
+						if(listAdd.size()>0){ 
+							listAdds.addAll(listAdd);
+						}
 					}
+					
 				}
-			}
-			
-			if(listAdds.size()>0){
-				new BatchSaveUtils<Sheet>().saveList(listAdds, Sheet.class); 
-			}
-			result = "success";
+				if(listAdds.size()>0){
+					new BatchSaveUtils<Sheet>().saveList(listAdds, Sheet.class); 
+				}
+				result = "success";
+		}else{
+			result ="count";
+		}
 		}catch (Exception e) {
 			// TODO Auto-generated catch block
 			throw e;