调度指令分析根据更换设备号时间处理

廖磊
1 parent bb164046
Showing 3 changed files with 64 additions and 19 deletions
src/main/java/com/bsth/repository/CarDeviceRepository.java
src/main/java/com/bsth/service/realcontrol/impl/ScheduleRealInfoServiceImpl.java
src/main/resources/static/pages/forms/statement/historyMessage.html
@@ -15,4 +15,10 @@ import org.springframework.stereotype.Repository;
 public interface CarDeviceRepository extends BaseRepository<CarDevice, Long> {
 	@Query(value="select s from CarDevice s where s.newDeviceNo=?1 and s.qyrq<=?2 ")
 	List<CarDevice> findCarDevice(String device,Date date );
+	
+	@Query(value="select s from CarDevice s where s.oldDeviceNo=?1 and s.qyrq>=?2 ")
+	List<CarDevice> findCarOldDevice(String device,Date date );
+	
+	@Query(value="select s from CarDevice s where s.clZbh=?1 and s.qyrq>=?2 ")
+	List<CarDevice> findCarCode(String code,Date date );
 }
@@ -1210,34 +1210,73 @@ public class ScheduleRealInfoServiceImpl extends BaseServiceImpl&lt;ScheduleRealInf
  
         }
         String device = "";
+        String device2 ="";
+        long qyrqTime=0l;
         if (!code.equals("")) {
-            device = BasicData.deviceId2NbbmMap.inverse().get(code);
+        	try {
+				List<CarDevice> deviceList=carDeviceRepository.findCarCode(code, sdf.parse(date+ " 00:00:00"));
+				if(deviceList.size()>0){
+					device=deviceList.get(0).getOldDeviceNo();
+					Date qyrq=deviceList.get(0).getQyrq();
+					qyrqTime=qyrq.getTime();
+					if(qyrqTime<t){
+						device2=deviceList.get(0).getNewDeviceNo();
+					}
+				}else{
+		            device = BasicData.deviceId2NbbmMap.inverse().get(code);
+				}
+			} catch (ParseException e) {
+				// TODO Auto-generated catch block
+				e.printStackTrace();
+			}
         }
-        List<Object[]> list = scheduleRealInfoRepository.historyMessage(line, d, t, device);
-        for (Object[] obj : list) {
+        List<Object[]> list=new ArrayList<Object[]>();
+        
+        List<Object[]> list0 =scheduleRealInfoRepository.historyMessage(line, d, t, device);
+        for (Object[] obj : list0) {
             if (obj != null) {
-
-                if (BasicData.deviceId2NbbmMap.get(obj[0].toString()) == null) {
-                    List<CarDevice> carDeviceList = new ArrayList<CarDevice>();
-                    try {
-                        carDeviceList = carDeviceRepository.findCarDevice(obj[0].toString(), new Date(Long.parseLong(obj[3].toString())));
-                    } catch (Exception e) {
-                        // TODO Auto-generated catch block
-                        e.printStackTrace();
-                    }
-                    if (carDeviceList.size() > 0) {
-                        obj[0] = carDeviceList.get(0).getClZbh();
+            	if(code.equals("")){
+            		if (BasicData.deviceId2NbbmMap.get(obj[0].toString()) == null) {
+                        List<CarDevice> carDeviceList = new ArrayList<CarDevice>();
+                        try {
+                                carDeviceList = carDeviceRepository.findCarDevice(obj[0].toString(), new Date(Long.parseLong(obj[3].toString())));
+                                //启用日期大于营运日期 还是根据旧设备号查询
+                                if(carDeviceList.size()==0){
+                                   carDeviceList = carDeviceRepository.findCarOldDevice(obj[0].toString(), new Date(Long.parseLong(obj[3].toString())));
+                                }
+                        } catch (Exception e) {
+                            // TODO Auto-generated catch block
+                            e.printStackTrace();
+                        }
+                        if (carDeviceList.size() > 0) {
+                            obj[0] = carDeviceList.get(0).getClZbh();
+                        } else {
+                            obj[0] = BasicData.deviceId2NbbmMap.get(obj[0].toString());
+                        }
                     } else {
                         obj[0] = BasicData.deviceId2NbbmMap.get(obj[0].toString());
                     }
-                } else {
-                    obj[0] = BasicData.deviceId2NbbmMap.get(obj[0].toString());
-                }
+            	}else{
+            		obj[0]=code;
+            	}
+                
                 obj[3] = sdf.format(new Date(Long.parseLong(obj[3].toString())));
                 obj[4] = BasicData.lineCode2NameMap.get(line);
             }
         }
-
+        list.addAll(list0);
+        if(!device2.equals("")){
+        	List<Object[]> list1 =scheduleRealInfoRepository.historyMessage(line, d, t, device2);
+            for (Object[] obj : list1) {
+                if (obj != null) {
+                	obj[0] =code;
+                    obj[3] = sdf.format(new Date(Long.parseLong(obj[3].toString())));
+                    obj[4] = BasicData.lineCode2NameMap.get(line);
+                }
+            }
+            list.addAll(list1);
+        }
+        
         if (type != null && type.length() != 0 && type.equals("export")) {
             String lineName = BasicData.lineCode2NameMap.get(line);
             SimpleDateFormat sdfMonth = new SimpleDateFormat("yyyy-MM-dd"),
@@ -3268,6 +3307,7 @@ public class ScheduleRealInfoServiceImpl extends BaseServiceImpl&lt;ScheduleRealInf
         List<ScheduleRealInfo> listInfo2=new ArrayList<ScheduleRealInfo>();
         listInfo2.addAll(listInfo);
         Collections.sort(listInfo, new compareLpFcsjType());
+        System.out.println(listInfo);
         Collections.sort(listInfo2,new compareDirLpFcsjType());
         for (int i = 0; i < listInfo.size(); i++) {
             ScheduleRealInfo t = listInfo.get(i);
@@ -159,7 +159,6 @@
 			var type = "query";
 			$(".hidden").removeClass("hidden");
 			var i = layer.load(2);
-			console.log("code:"+code);
 			if(code==""||code==null){
 				$get('/realSchedule/historyMessage',{line:line,date:date,code:code,type:type},function(result){
 					// 把数据填充到模版中