修正日志1

潘钊
1 parent 0131ec0e
Showing 12 changed files with 455 additions and 21 deletions
src/main/java/com/bsth/XDApplication.java
src/main/java/com/bsth/data/safe_driv/SafeDrivCenter.java
src/main/java/com/bsth/data/schedule/edit_logs/ScheduleModifyLogger.java
src/main/java/com/bsth/data/schedule/edit_logs/SeiPstThread.java
src/main/java/com/bsth/data/schedule/edit_logs/entity/EditType.java
src/main/java/com/bsth/data/schedule/edit_logs/entity/SchEditInfo.java
src/main/java/com/bsth/data/schedule/edit_logs/loggers/FcxxwtLogger.java
src/main/java/com/bsth/data/schedule/edit_logs/repository/EditInfoRepository.java
src/main/java/com/bsth/service/realcontrol/impl/ScheduleRealInfoServiceImpl.java
src/main/resources/static/real_control_v2/fragments/line_schedule/context_menu/dftz.html
src/main/resources/static/real_control_v2/fragments/line_schedule/context_menu/fcxxwt.html
src/main/resources/static/real_control_v2/js/line_schedule/dbclick.js
@@ -6,6 +6,7 @@ import com.bsth.data.car_out_info.UpdateDBThread;
 import com.bsth.data.directive.DirectivesPstThread;
 import com.bsth.data.gpsdata.thread.GpsDataLoaderThread;
 import com.bsth.data.gpsdata.thread.OfflineMonitorThread;
+import com.bsth.data.schedule.edit_logs.SeiPstThread;
 import com.bsth.data.schedule.late_adjust.ScheduleLateThread;
 import com.bsth.data.schedule.thread.CalcOilThread;
 import com.bsth.data.schedule.thread.SchedulePstThread;
@@ -53,6 +54,8 @@ public class XDApplication implements CommandLineRunner {
     DirectivesPstThread directivesPstThread;
     @Autowired
     ThreadMonotor threadMonotor;
+    @Autowired
+    SeiPstThread seiPstThread;
     private static long timeDiff;
@@ -93,6 +96,8 @@ public class XDApplication implements CommandLineRunner {
         //sexec.scheduleWithFixedDelay(scheduleRefreshThread, 15, 240, TimeUnit.SECONDS);
         //实际排班延迟入库线程
         //sexec.scheduleWithFixedDelay(schedulePstThread, 60, 15, TimeUnit.SECONDS);
+        //班次修正日志延迟入库
+        //sexec.scheduleWithFixedDelay(seiPstThread, 60, 60, TimeUnit.SECONDS);
         //线程监听（防止重要的线程阻塞、异常结束。以及部分主备切换工作）
         //sexec.scheduleWithFixedDelay(threadMonotor, 240, 60, TimeUnit.SECONDS);
@@ -107,10 +112,12 @@ public class XDApplication implements CommandLineRunner {
         sexec.scheduleWithFixedDelay(gpsDataLoader, 30, 2, TimeUnit.SECONDS);
         //GPS设备掉离线
         sexec.scheduleWithFixedDelay(offlineMonitorThread, 120, 60, TimeUnit.SECONDS);
-        //实际排班更新线程
+        //班次更新线程
         sexec.scheduleWithFixedDelay(scheduleRefreshThread, 15, 240, TimeUnit.SECONDS);
-        //实际排班延迟入库线程
+        //班次延迟入库线程
         sexec.scheduleWithFixedDelay(schedulePstThread, 60, 15, TimeUnit.SECONDS);
+        //班次修正日志延迟入库
+        sexec.scheduleWithFixedDelay(seiPstThread, 60, 60, TimeUnit.SECONDS);
         //检查班次误点
         sexec.scheduleWithFixedDelay(scheduleLateThread, 60, 30, TimeUnit.SECONDS);
         //调度指令延迟入库
 package com.bsth.data.safe_driv;
-import com.bsth.Application;
 import com.bsth.websocket.handler.SendUtils;
 import org.joda.time.format.DateTimeFormat;
 import org.joda.time.format.DateTimeFormatter;
@@ -15,7 +14,6 @@ import java.util.HashMap;
 import java.util.HashSet;
 import java.util.Map;
 import java.util.Set;
-import java.util.concurrent.TimeUnit;
 /**
  * 安全驾驶
@@ -69,7 +67,7 @@ public class SafeDrivCenter implements CommandLineRunner,ApplicationContextAware
     @Override
     public void run(String... strings) throws Exception {
         //定时加载安全驾驶数据
-        Application.mainServices.scheduleWithFixedDelay(safeDrivDataLoadThread, 60, 7, TimeUnit.SECONDS);
+        //Application.mainServices.scheduleWithFixedDelay(safeDrivDataLoadThread, 80, 7, TimeUnit.SECONDS);
     }
     @Override
 package com.bsth.data.schedule.edit_logs;
+import com.alibaba.fastjson.JSONArray;
+import com.alibaba.fastjson.JSONObject;
+import com.bsth.data.schedule.edit_logs.entity.EditType;
+import com.bsth.data.schedule.edit_logs.entity.SchEditInfo;
+import com.bsth.entity.realcontrol.ScheduleRealInfo;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+import java.util.LinkedList;
+
 /**
  * 班次修正记录
  * Created by panzhao on 2017/5/16.
  */
 public class ScheduleModifyLogger {
+    public static LinkedList<SchEditInfo> list;
+
+    static {
+        list = new LinkedList<>();
+    }
+
+    static Logger log = LoggerFactory.getLogger(ScheduleModifyLogger.class);
+
     /**
      * 待发调整
+     * opType 0: 双击调整、 1：待发调整、2：批量待发调整、3：间隔调整
      */
-    public static void dftz(Long id, String remarks, String dfsj, String bcType, String opType){
+    public static void dftz(ScheduleRealInfo sch, String opType, String oldDfsj, String nowDfsj, String remarks){
+        try {
+            if(oldDfsj.equals(nowDfsj))
+                return;
+
+            SchEditInfo sei = SchEditInfo.getInstance(sch);
+            sei.setType(EditType.DFTZ);
+            sei.setType2(opType);
+            sei.setRemarks(remarks==null?"":remarks);
+
+            //detail
+            JSONObject jobj = new JSONObject();
+            jobj.put("old", oldDfsj);
+            jobj.put("now", nowDfsj);
+
+            sei.setJsonArray(jobj.toJSONString());
+
+            put(sei);
+        }catch (Exception e){
+            log.error("", e);
+        }
+    }
+
+    /**
+     * 发车信息微调记录器
+     */
+    public static void fcxxwt(ScheduleRealInfo sch, String remarks, JSONArray jsonArray){
+
+        try {
+            if(jsonArray == null || jsonArray.size() == 0)
+                return;
+
+            SchEditInfo sei = SchEditInfo.getInstance(sch);
+            sei.setRemarks(remarks);
+            sei.setJsonArray(jsonArray.toJSONString());
+            sei.setType(EditType.FCXXWT);
+
+            put(sei);
+        }catch (Exception e){
+            log.error("", e);
+        }
+    }
+
+    /**
+     * 计划烂班
+     * @param remarks
+     */
+    public static void jhlb(ScheduleRealInfo sch, String remarks){
+        try {
+            SchEditInfo sei = SchEditInfo.getInstance(sch);
+            sei.setRemarks(remarks);
+            sei.setType(EditType.JHLB);
+
+            put(sei);
+        }catch (Exception e){
+            log.error("", e);
+        }
+    }
+    public static void put(SchEditInfo sei){
+        list.add(sei);
     }
 }
 \ No newline at end of file
+package com.bsth.data.schedule.edit_logs;
+
+import com.bsth.data.schedule.edit_logs.entity.SchEditInfo;
+import com.bsth.data.schedule.edit_logs.repository.EditInfoRepository;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Component;
+
+import java.util.LinkedList;
+
+/**
+ * 班次修正日志入库
+ * Created by panzhao on 2017/5/19.
+ */
+@Component
+public class SeiPstThread extends Thread{
+
+    @Autowired
+    EditInfoRepository repository;
+
+    Logger log = LoggerFactory.getLogger(this.getClass());
+
+    @Override
+    public void run() {
+        try{
+            LinkedList<SchEditInfo> list = ScheduleModifyLogger.list;
+            SchEditInfo sei;
+            for(int i = 0; i < 1000; i ++){
+                sei = list.poll();
+                if(sei == null)
+                    break;
+                else{
+                    repository.save(sei);
+                }
+            }
+        }catch (Exception e){
+            log.error("", e);
+        }
+    }
+}
+package com.bsth.data.schedule.edit_logs.entity;
+
+/**
+ * Created by panzhao on 2017/5/18.
+ */
+public enum EditType {
+
+    DFTZ,SFTZ,FCXXWT,TZRC,LPDD,ZRW,JHLB
+}
+package com.bsth.data.schedule.edit_logs.entity;
+
+import com.bsth.entity.realcontrol.ScheduleRealInfo;
+import com.bsth.entity.sys.SysUser;
+import com.bsth.security.util.SecurityUtils;
+import org.joda.time.format.DateTimeFormat;
+import org.joda.time.format.DateTimeFormatter;
+
+import javax.persistence.*;
+
+/**
+ * Created by panzhao on 2017/5/18.
+ */
+@Entity
+@Table(name = "logger_sch_modify")
+public class SchEditInfo {
+
+    @Id
+    @GeneratedValue
+    private long id;
+    /**
+     * 日期 yyyy-MM-dd
+     */
+    private String rq;
+
+    /**
+     * 时间 HH:mm
+     */
+    private String timeStr;
+
+    private String lineCode;
+
+    private String gsbm;
+
+    private String fgsbm;
+
+    /**
+     * 班次ID
+     */
+    private long schId;
+
+    /**
+     * 类型
+     */
+    @Enumerated(EnumType.STRING)
+    private EditType type;
+
+    private String type2;
+    /**
+     * 操作人 @system 系统/用户名
+     */
+    private String user;
+
+    /**
+     * 操作明细
+     */
+    @Column(length = 2000)
+    private String jsonArray;
+
+    private String remarks;
+
+    public String getRq() {
+        return rq;
+    }
+
+    public void setRq(String rq) {
+        this.rq = rq;
+    }
+
+    public String getTimeStr() {
+        return timeStr;
+    }
+
+    public void setTimeStr(String timeStr) {
+        this.timeStr = timeStr;
+    }
+
+    public long getSchId() {
+        return schId;
+    }
+
+    public void setSchId(long schId) {
+        this.schId = schId;
+    }
+
+    public EditType getType() {
+        return type;
+    }
+
+    public void setType(EditType type) {
+        this.type = type;
+    }
+
+    public String getUser() {
+        return user;
+    }
+
+    public void setUser(String user) {
+        this.user = user;
+    }
+
+    public long getId() {
+        return id;
+    }
+
+    public void setId(long id) {
+        this.id = id;
+    }
+
+    public String getJsonArray() {
+        return jsonArray;
+    }
+
+    public void setJsonArray(String jsonArray) {
+        this.jsonArray = jsonArray;
+    }
+
+    public String getType2() {
+        return type2;
+    }
+
+    public void setType2(String type2) {
+        this.type2 = type2;
+    }
+
+    public String getRemarks() {
+        return remarks;
+    }
+
+    public void setRemarks(String remarks) {
+        this.remarks = remarks;
+    }
+
+
+    @Transient
+    private static DateTimeFormatter fmtHHmm = DateTimeFormat.forPattern("HH:mm");
+    @Transient
+    private static DateTimeFormatter fmtyyyyMMdd = DateTimeFormat.forPattern("yyyy-MM-dd");
+    public static SchEditInfo getInstance(ScheduleRealInfo sch){
+        SchEditInfo sei = new SchEditInfo();
+        long t = System.currentTimeMillis();
+
+        sei.setRq(fmtyyyyMMdd.print(t));
+        sei.setTimeStr(fmtHHmm.print(t));
+
+        SysUser user = SecurityUtils.getCurrentUser();
+        if(user != null)
+            sei.setUser(user.getUserName());
+
+        if(sch != null){
+            sei.setSchId(sch.getId());
+            sei.setLineCode(sch.getXlBm());
+            sei.setGsbm(sch.getGsBm());
+            sei.setFgsbm(sch.getFgsBm());
+        }
+        return sei;
+    }
+
+    public String getLineCode() {
+        return lineCode;
+    }
+
+    public void setLineCode(String lineCode) {
+        this.lineCode = lineCode;
+    }
+
+    public String getGsbm() {
+        return gsbm;
+    }
+
+    public void setGsbm(String gsbm) {
+        this.gsbm = gsbm;
+    }
+
+    public String getFgsbm() {
+        return fgsbm;
+    }
+
+    public void setFgsbm(String fgsbm) {
+        this.fgsbm = fgsbm;
+    }
+}
+package com.bsth.data.schedule.edit_logs.loggers;
+
+import com.alibaba.fastjson.JSONArray;
+import com.alibaba.fastjson.JSONObject;
+import com.bsth.data.schedule.edit_logs.ScheduleModifyLogger;
+import com.bsth.entity.realcontrol.ScheduleRealInfo;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+/**
+ * 发车信息微调记录
+ * Created by panzhao on 2017/5/19.
+ */
+public class FcxxwtLogger {
+
+    static Logger log = LoggerFactory.getLogger(FcxxwtLogger.class);
+
+    private JSONArray jsonArray = new JSONArray();
+    private String remarks;
+    private ScheduleRealInfo sch;
+
+    public void log(String title, Object old, Object now){
+        try {
+
+            JSONObject jsonObject = new JSONObject();
+            jsonObject.put("title", title);
+            jsonObject.put("old", old);
+            jsonObject.put("now", now);
+
+            jsonArray.add(jsonObject);
+        }catch (Exception e){
+            log.error("", e);
+        }
+    }
+
+    public void log(String text){
+        try {
+            JSONObject jsonObject = new JSONObject();
+            jsonObject.put("title", text);
+
+            jsonArray.add(jsonObject);
+        }catch (Exception e){
+            log.error("", e);
+        }
+    }
+
+    public static FcxxwtLogger start(ScheduleRealInfo sch, String remarks){
+        FcxxwtLogger fLog = new FcxxwtLogger();
+        fLog.setSch(sch);
+        fLog.setRemarks(remarks);
+        return fLog;
+    }
+
+    public void end(){
+        ScheduleModifyLogger.fcxxwt(sch, this.remarks, jsonArray);
+    }
+
+    public String getRemarks() {
+        return remarks;
+    }
+
+    public void setRemarks(String remarks) {
+        this.remarks = remarks;
+    }
+
+    public ScheduleRealInfo getSch() {
+        return sch;
+    }
+
+    public void setSch(ScheduleRealInfo sch) {
+        this.sch = sch;
+    }
+}
+package com.bsth.data.schedule.edit_logs.repository;
+
+import com.bsth.data.schedule.edit_logs.entity.SchEditInfo;
+import com.bsth.repository.BaseRepository;
+import org.springframework.stereotype.Repository;
+
+/**
+ * Created by panzhao on 2017/5/19.
+ */
+@Repository
+public interface EditInfoRepository extends BaseRepository<SchEditInfo, Long>{
+}
@@ -15,6 +15,8 @@ import com.bsth.data.schedule.DayOfSchedule;
 import com.bsth.data.schedule.SchAttrCalculator;
 import com.bsth.data.schedule.edit_logs.FormLogger;
 import com.bsth.data.schedule.ScheduleComparator;
+import com.bsth.data.schedule.edit_logs.ScheduleModifyLogger;
+import com.bsth.data.schedule.edit_logs.loggers.FcxxwtLogger;
 import com.bsth.data.schedule.late_adjust.LateAdjustHandle;
 import com.bsth.entity.Cars;
 import com.bsth.entity.Line;
@@ -221,6 +223,9 @@ public class ScheduleRealInfoServiceImpl extends BaseServiceImpl&lt;ScheduleRealInf
                 schedule.setRealExecDate(schedule.getScheduleDateStr());
             }
+            //记录日志
+            ScheduleModifyLogger.dftz(schedule,opType, schedule.getDfsj(),dfsj,remarks);
+
             schedule.setDfsjAll(dfsj);
             schedule.setDfAuto(false);
             schedule.addRemarks(remarks);
@@ -276,6 +281,8 @@ public class ScheduleRealInfoServiceImpl extends BaseServiceImpl&lt;ScheduleRealInf
                     map.put("msg", "不必要的重复烂班！");
                     return map;
                 }
+                //记录日志
+                ScheduleModifyLogger.jhlb(schedule, remarks);
                 schedule.setAdjustExps(reason);
                 schedule.destroy();
@@ -1163,7 +1170,7 @@ public class ScheduleRealInfoServiceImpl extends BaseServiceImpl&lt;ScheduleRealInf
                     sch = list.get(i);
                     //调整待发
-                    outgoAdjust(sch.getId(), null, fmtHHmm.print(st), null, "间隔调整");
+                    outgoAdjust(sch.getId(), null, fmtHHmm.print(st), null, "3");
                 }
                 rs.put("status", ResponseCode.SUCCESS);
@@ -1186,6 +1193,8 @@ public class ScheduleRealInfoServiceImpl extends BaseServiceImpl&lt;ScheduleRealInf
         List<ScheduleRealInfo> ts = new ArrayList<>();
         try {
             Long id = Long.parseLong(map.get("id"));
+            String remarks = map.get("remarks");
+
             ScheduleRealInfo sch = dayOfSchedule.get(id);
             if(null == sch){
@@ -1194,6 +1203,9 @@ public class ScheduleRealInfoServiceImpl extends BaseServiceImpl&lt;ScheduleRealInf
                 return rs;
             }
+            //日志记录器
+            FcxxwtLogger fLog = FcxxwtLogger.start(sch, remarks);
+
             String clZbh = map.get("clZbh");
             String jsy = map.get("jsy");
             if(!clZbh.equals(sch.getClZbh())
@@ -1208,7 +1220,8 @@ public class ScheduleRealInfoServiceImpl extends BaseServiceImpl&lt;ScheduleRealInf
                     rs.put("status", ResponseCode.ERROR);
                     rs.put("msg", "车辆 " + clZbh + " 不存在！");
                     return rs;
-                } else {
+                } else if(!clZbh.equals(sch.getClZbh())){
+                    fLog.log("换车", sch.getClZbh(), clZbh);
                     dayOfSchedule.changeCar(sch, clZbh);
                 }
             }
@@ -1224,7 +1237,10 @@ public class ScheduleRealInfoServiceImpl extends BaseServiceImpl&lt;ScheduleRealInf
                     rs.put("status", ResponseCode.ERROR);
                     return rs;
                 }
-                persoChange(sch, jGh);
+                else if(!jGh.equals(sch.getjGh())){
+                    fLog.log("换驾驶员", sch.getjGh() + "/" + sch.getjName(), jsy);
+                    persoChange(sch, jGh);
+                }
             }
             /**
@@ -1239,9 +1255,13 @@ public class ScheduleRealInfoServiceImpl extends BaseServiceImpl&lt;ScheduleRealInf
                     rs.put("status", ResponseCode.ERROR);
                     return rs;
                 }
-                persoChangeSPY(sch, sGh);
+                else if(!sGh.equals(sch.getsGh())){
+                    fLog.log("换售票员", sch.getsGh() + "/" + sch.getsName(), spy);
+                    persoChangeSPY(sch, sGh);
+                }
             }
-            else{
+            else if(StringUtils.isNotEmpty(sch.getsGh())){
+                fLog.log("撤销售票员");
                 sch.setsGh("");
                 sch.setsName("");
             }
@@ -1261,6 +1281,7 @@ public class ScheduleRealInfoServiceImpl extends BaseServiceImpl&lt;ScheduleRealInf
                 else
                     t = fmtyyyyMMddHHmm.parseMillis(sch.getScheduleDateStr() + fcsjActual);
+                fLog.log("调整实发时间", sch.getFcsjActual(), fcsjActual);
                 sch.setFcsjActualAll(t);
                 //取消应发未到标记
                 if(sch.isLate2()){
@@ -1268,6 +1289,7 @@ public class ScheduleRealInfoServiceImpl extends BaseServiceImpl&lt;ScheduleRealInf
                     LateAdjustHandle.remove(sch);
                 }
             } else if (StringUtils.isNotEmpty(sch.getFcsjActual()) && StringUtils.isEmpty(fcsjActual)){
+                fLog.log("撤销实发时间", sch.getFcsjActual(), "");
                 //撤销实发
                 revokeRealOutgo(sch.getId());
             }
@@ -1280,6 +1302,7 @@ public class ScheduleRealInfoServiceImpl extends BaseServiceImpl&lt;ScheduleRealInf
                     && !zdsjActual.equals(sch.getZdsjActual())) {
                 //调整实达
+                fLog.log("调整实达时间", sch.getZdsjActual(), zdsjActual);
                 sch.setZdsjActualAll(zdsjActual);
                 //路牌下一班起点到达时间
                 ScheduleRealInfo next = dayOfSchedule.nextByLp(sch);
@@ -1294,7 +1317,7 @@ public class ScheduleRealInfoServiceImpl extends BaseServiceImpl&lt;ScheduleRealInf
                     ScheduleRealInfo carNext = dayOfSchedule.next(sch);
                     if(carNext != null && !carNext.getXlBm().equals(sch.getXlBm())){
                         DirectivePushQueue.put64(carNext.getClZbh(), carNext.getXlBm(), "套跑@系统");
-                        //directiveService.lineChange(carNext.getClZbh(), carNext.getXlBm(), "套跑@系统");
+                        fLog.log("下发线路切换指令", sch.getXlName(), carNext.getXlName());
                     }
                 }catch (Exception e){logger.error("", e);}
@@ -1302,6 +1325,7 @@ public class ScheduleRealInfoServiceImpl extends BaseServiceImpl&lt;ScheduleRealInf
                 dayOfSchedule.reCalcExecPlan(sch.getClZbh());
             } else if(StringUtils.isNotEmpty(sch.getZdsjActual()) && StringUtils.isEmpty(zdsjActual)){
                 //清除实达时间
+                fLog.log("撤销实达时间", sch.getZdsjActual(), "");
                 sch.clearZdsjActual();
                 //清除路牌下一班起点到达时间
                 ScheduleRealInfo next = dayOfSchedule.nextByLp(sch);
@@ -1316,7 +1340,7 @@ public class ScheduleRealInfoServiceImpl extends BaseServiceImpl&lt;ScheduleRealInf
             /**
              * 备注
              */
-            sch.setRemarks(map.get("remarks"));
+            sch.setRemarks(remarks);
             /**
              * 烂班
@@ -1324,6 +1348,7 @@ public class ScheduleRealInfoServiceImpl extends BaseServiceImpl&lt;ScheduleRealInf
             if (map.get("status") != null
                     && Integer.parseInt(map.get("status").toString()) == -1) {
                 destroy(sch.getId() + "", "", map.get("adjustExps").toString());
+                fLog.log("烂班");
             }
             /**
@@ -1333,9 +1358,12 @@ public class ScheduleRealInfoServiceImpl extends BaseServiceImpl&lt;ScheduleRealInf
             if (StringUtils.isNotEmpty(jhlc)) {
                 double jhlcNum = Double.parseDouble(jhlc);
                 //烂班
-                if(jhlcNum == 0 && sch.getJhlcOrig() != 0 && !sch._isInout())
+                if(jhlcNum == 0 && sch.getJhlcOrig() != 0 && !sch._isInout() && !sch.isDestroy()){
                     destroy(sch.getId() + "", "", map.get("adjustExps").toString());
+                    fLog.log("里程设置为0，自动烂班");
+                }
                 else if(jhlcNum != sch.getJhlc()){
+                    fLog.log("设置里程", sch.getJhlc(), jhlcNum);
                     sch.setJhlc(jhlcNum);
                     //临加班次，实际计划一起改
                     if(sch.isSflj())
@@ -1347,7 +1375,8 @@ public class ScheduleRealInfoServiceImpl extends BaseServiceImpl&lt;ScheduleRealInf
              * 修改班次类型
              */
             String bcType = map.get("bcType");
-            if (StringUtils.isNotEmpty(bcType)) {
+            if (StringUtils.isNotEmpty(bcType) && !bcType.equals(sch.getBcType())) {
+                fLog.log("修改班次类型", sch.getBcType(), bcType);
                 sch.setBcType(bcType);
             }
@@ -1359,6 +1388,9 @@ public class ScheduleRealInfoServiceImpl extends BaseServiceImpl&lt;ScheduleRealInf
             rs.put("status", ResponseCode.SUCCESS);
             rs.put("ts", ts);
+
+            //日志记录结束
+            fLog.end();
         } catch (Exception e) {
             logger.error("", e);
             rs.put("status", ResponseCode.ERROR);
@@ -1383,7 +1415,7 @@ public class ScheduleRealInfoServiceImpl extends BaseServiceImpl&lt;ScheduleRealInf
                 schedule = dayOfSchedule.get(id);
                 if(schedule != null)
-                    outgoAdjust(id, null, dfsj, null, "批量调整");
+                    outgoAdjust(id, null, dfsj, null, "2");
             }
             rs.put("status", ResponseCode.SUCCESS);
@@ -3144,7 +3176,6 @@ public class ScheduleRealInfoServiceImpl extends BaseServiceImpl&lt;ScheduleRealInf
         Set<ScheduleRealInfo> set = new HashSet<>();
         ScheduleRealInfo sch;
-        //BiMap<String, String> map = BasicData.deviceId2NbbmMap.inverse();
         String jGh = null,jName,sGh,sName;
         for (ChangePersonCar cpc : cpcs) {
@@ -3257,7 +3288,7 @@ public class ScheduleRealInfoServiceImpl extends BaseServiceImpl&lt;ScheduleRealInf
             if (StringUtils.isEmpty(dc.getOld_dfsj()) || StringUtils.isEmpty(dc.getNew_dfsj()))
                 continue;
-            tempMap = outgoAdjust(dc.getSchId(), "", dc.getNew_dfsj(), null, "批量调整");
+            tempMap = outgoAdjust(dc.getSchId(), "", dc.getNew_dfsj(), null, "2");
             if (tempMap.get("status").equals(ResponseCode.SUCCESS)) {
                 list.addAll((Collection<? extends ScheduleRealInfo>) tempMap.get("ts"));
@@ -9,6 +9,7 @@
     <script id="schedule-dftz-form-temp" type="text/html">
         <input type="hidden" name="id" value="{{id}}"/>
+        <input type="hidden" name="opType" value="1"/>
         <div class="uk-grid">
             <div class="uk-width-1-2">
                 <div class="uk-form-row">
@@ -191,8 +191,9 @@
                     e.preventDefault();
                     var data = $(this).serializeJSON();
-                    if(data.status==-1 && !data.adjustExps){
-                        notify_err("烂班需要选择调整原因！");
+                    if(!data.adjustExps && (data.status==-1
+                        || (data.jhlc==0 && sch.bcType != 'in' && sch.bcType != 'out'))){
+                        notify_err("当前操作需要选择调整原因！");
                         return;
                     }
@@ -18,7 +18,8 @@ var gb_schedule_table_dbclick = (function() {
             gb_common.$post('/realSchedule/outgoAdjust', {
                 id: id,
                 dfsj: val,
-                remarks: ''
+                remarks: '',
+                opType: '0'
             }, function(rs) {
                 gb_schedule_table.updateSchedule(rs.ts);
                 notify_succ('待发调整成功！');