1

ljq
1 parent f92fbfdb
Showing 5 changed files with 17 additions and 6 deletions
src/main/java/com/bsth/data/zndd/AutomaticSch.java
src/main/java/com/bsth/repository/realcontrol/ScheduleRealInfoRepository.java
src/main/java/com/bsth/service/realcontrol/impl/ScheduleRealInfoServiceImpl.java
src/main/resources/static/real_control_v2/zndd/type/sftz_1.html
src/main/resources/static/real_control_v2/zndd/type/ycsf.html
@@ -189,7 +189,7 @@ public class AutomaticSch {
                     // 发车误点 
                     if (t.getFcsj() != null && t.getFcsjActual() != null  && t.getBcType().equals("normal") && t.getRemarks() == null){
                         Long sst = ((t.getFcsjActualTime() - t.getFcsjT()) / 1000 / 60);
-                        Long dfsj = t.getDfsjT() / 1000 ;
+                        Long fcsj = t.getFcsjT() / 1000 ;
                         Long sfsj = t.getFcsjActualTime() / 1000;
                         //获取车辆状态 gps没有的情况下，或者车辆状态异常的情况
                         //判定gps发送时间和现在时间作对比
@@ -202,13 +202,13 @@ public class AutomaticSch {
                                 (gps.getAbnormalStatus() != null && gps.getAbnormalStatus().equals("offline"))){
                             //实发快一慢三   
                           /*  if (sst <= 3 && sst >= -1){*/
-                                if(dfsj.equals(sfsj)) 
+                                if(fcsj.equals(sfsj)) 
                                     continue;
                                 //快1
-                                if(sfsj < dfsj && dfsj - sfsj <=  60*4) 
+                                if(sfsj < fcsj && fcsj - sfsj <=  60 * 1) 
                                     continue;
                                 //慢3
-                                if(dfsj < sfsj && sfsj - dfsj <= 60 *6) 
+                                if(fcsj < sfsj && sfsj - fcsj <= 60 *3) 
                                     continue;
@@ -252,4 +252,13 @@ public interface ScheduleRealInfoRepository extends BaseRepository&lt;ScheduleRealI
 	@Query(value = "select r.xl_bm as line,r.cl_zbh as nbbm,r.j_gh as jGh,r.s_gh as sGh from bsth_c_s_sp_info_real r where r.schedule_date_str BETWEEN ?1 and ?2 " +
 			"and if( ?3 is not null , r.xl_bm = ?3 , r.gs_bm = ?4 and r.fgs_bm =?5) group  by  r.xl_bm,r.cl_zbh,r.j_gh,r.s_gh", nativeQuery = true)
 	List<Map<String, Object>> querySchedule2(String date1, String date2,String line ,String gsdm ,String fgsdm);
+
+	/**
+	 * 根据日期获取班次信息
+	 * @param schDate
+	 * @return
+	 */
+	@EntityGraph(value = "scheduleRealInfo_cTasks", type = EntityGraph.EntityGraphType.FETCH)
+	@Query("select DISTINCT s from ScheduleRealInfo s where s.scheduleDateStr=?1")
+	List<ScheduleRealInfo> findAllSchDate(String schDate);
 }
@@ -1623,6 +1623,7 @@ public class ScheduleRealInfoServiceImpl extends BaseServiceImpl&lt;ScheduleRealInf
             String text = sch.getFcsj()+"的班次进行了实发调整";
             lz.setText(text);
             lz.setCreateBy(SecurityUtils.getCurrentUser().getId());
+            lz.setCreateDate(new Date());
             loggerZnddRepository.save(lz);
             //通知页面刷新
@@ -1723,6 +1724,7 @@ public class ScheduleRealInfoServiceImpl extends BaseServiceImpl&lt;ScheduleRealInf
                 String text = sch.getFcsj()+"的班次进行了实发撤销调整";
                 lz.setText(text);
                 lz.setCreateBy(SecurityUtils.getCurrentUser().getId());
+                lz.setCreateDate(new Date());
                 loggerZnddRepository.save(lz);
             }
         } catch (Exception e) {
@@ -40,7 +40,7 @@
                     gb_common.$post('/realSchedule/realOutAdjust_zndd', {
                         id: sch.sch.id,
-                        remarks:"_智能调度-实发调整",
+                        remarks:"_自动调度实发调整-车辆掉线",
                         fcsjActual:data.fcsjActual,
                     }, function (rs) {
                         gb_schedule_table.updateSchedule(rs.ts);
@@ -242,7 +242,7 @@
       <div class="uk-form-row">
         <label class="uk-form-label">备注</label>
         <div class="uk-form-controls">
-          <input value="{{sch.remarks}}_智能调度-异常实发" disabled>
+          <input value="{{sch.remarks}}_智能调度-异常实发" name ="remarks">
         </div>
       </div>
     </div>