调度历史消息

廖磊
1 parent b2ed1902
Showing 3 changed files with 13 additions and 13 deletions
src/main/java/com/bsth/repository/realcontrol/ScheduleRealInfoRepository.java
src/main/java/com/bsth/service/realcontrol/impl/ScheduleRealInfoServiceImpl.java
src/main/resources/static/pages/oil/list_ph.html
@@ -46,12 +46,9 @@ public interface ScheduleRealInfoRepository extends BaseRepository&lt;ScheduleRealI
 			+ " s.xlBm = ?1 and s.scheduleDateStr = ?2 group by clZbh,jGh,jName")
 	List<Map<String, Object>> dailyInfo(String line,String date);
-	@Query(value="select t.inside_code,d.sender,d.txt_content,d.timestamp,0 as xlbm from  ("
-			+ "  select equipment_code,inside_code  from bsth_c_cars where id in("
-			+ " select cl from bsth_c_s_ccinfo where  xl in ( "
-			+ " select id from bsth_c_line where line_code=?1 ))) t"
-			+ " left join bsth_v_directive_60 d on t.equipment_code=d.device_id "
-			+ " where d.timestamp >=?2 and  d.timestamp <=?3 and t.inside_code like %?4% ",nativeQuery=true)
+	@Query(value="select d.device_id,d.sender,d.txt_content,d.timestamp,d.line_code from "
+			+ " bsth_v_directive_60 d  where d.line_code=?1 and d.timestamp >=?2 and  "
+			+ "d.timestamp <=?3 and d.device_id like %?4% ",nativeQuery=true)
 	List<Object[]> historyMessage(String line,long d,long t,String code);
 	@Query(value="SELECT r.xl_name,r.lp_name,r.cl_zbh,count(*) as cs "
@@ -1098,10 +1098,14 @@ public class ScheduleRealInfoServiceImpl extends BaseServiceImpl&lt;ScheduleRealInf
             }
         }
-
-        List<Object[]> list = scheduleRealInfoRepository.historyMessage(line, d, t, code);
+        String device="";
+        if(!code.equals("")){
+        	device=BasicData.deviceId2NbbmMap.inverse().get(code);
+        }
+        List<Object[]> list = scheduleRealInfoRepository.historyMessage(line, d, t, device);
         for (Object[] obj : list) {
             if (obj != null) {
+            	obj[0] =BasicData.deviceId2NbbmMap.get(obj[0].toString());
                 obj[3] = sdf.format(new Date(Long.parseLong(obj[3].toString())));
                 obj[4] = BasicData.lineCode2NameMap.get(line);
             }
@@ -2493,8 +2497,8 @@ public class ScheduleRealInfoServiceImpl extends BaseServiceImpl&lt;ScheduleRealInf
 	        map.put("ssgl", ssgl);
 	        //计划+临加-少驶=实驶
-	        double jl=Arith.add(jhyygl, ljgl);
-	        if(Arith.sub(jl, ssgl)==sjyygl){
+	        double jl=Arith.sub(Arith.add(jhyygl, ljgl),ssgl);
+	        if(jl==zyygl){
 	        	map.put("zt", 0);
 	        }else{
 	        	map.put("zt", 1);
@@ -2610,8 +2614,8 @@ public class ScheduleRealInfoServiceImpl extends BaseServiceImpl&lt;ScheduleRealInf
         double ssgl= culateService.culateLbgl(list);
         map.put("ssgl", ssgl);
         //计划+临加-少驶=实驶
-        double jl=Arith.add(jhyygl, ljgl);
-        if(Arith.sub(jl, ssgl)==sjyygl){
+        double jl=Arith.sub(Arith.add(jhyygl, ljgl),ssgl);
+        if(jl==zyygl){
         	map.put("zt", 0);
         }else{
         	map.put("zt", 1);
@@ -674,7 +674,6 @@ onkeyup=&quot;this.value=this.value.replace(/[^(\d||/.)]/g,&#39;&#39;).replace(&#39;.&#39;,&#39;$#$&#39;).rep
             var l = layer.load(2);
             $get('/ylb/ylbList', params, function (data) {
-            	console.log(data);
             	for(var i=1;i<data.length;i++){  
         	        moveArray[i]=new Array();  
         	        for(var j=1;j<6;j++){