Merge branch 'pudong' of 192.168.168.201:panzhaov5/bsth_control into

pudong

Merge branch 'pudong' of 192.168.168.201:panzhaov5/bsth_control into
pudong
娄高锋
2 parents fed7d37a 7c044cb7
Showing 27 changed files with 1044 additions and 319 deletions
pom.xml
src/main/java/com/bsth/entity/schedule/log/ModuleOperatorLog.java
src/main/java/com/bsth/entity/schedule/log/convert/ModuleOperatorTypeConverter.java
src/main/java/com/bsth/entity/schedule/log/convert/ModuleTypeConverter.java
src/main/java/com/bsth/entity/schedule/log/convert/OperatorTypeConverter.java
src/main/java/com/bsth/repository/oil/YlbRepository.java
src/main/java/com/bsth/service/gps/GpsServiceImpl.java
src/main/java/com/bsth/service/oil/impl/YlbServiceImpl.java
src/main/java/com/bsth/service/realcontrol/impl/ScheduleRealInfoServiceImpl.java
src/main/java/com/bsth/service/schedule/datatools/TTInfoDetailDataToolsImpl.java
src/main/java/com/bsth/service/schedule/log/ModuleOperatorDbAppender.java
src/main/java/com/bsth/service/schedule/log/PlanLogger.java
src/main/java/com/bsth/service/schedule/log/TimetableLogger.java
src/main/resources/fatso/start.js
src/main/resources/logback.xml
src/main/resources/static/pages/base/timesmodel/js/add-form-reload.js
src/main/resources/static/pages/base/timesmodel/js/gantt.js
src/main/resources/static/pages/base/timesmodel/js/v2_2/Main_v2_2_ExcelObj.js
src/main/resources/static/pages/base/timesmodel/js/v2_2/main_v2_2.js
src/main/resources/static/pages/home.html
@@ -295,6 +295,13 @@
 			<artifactId>jpinyin</artifactId>
 			<version>1.1.8</version>
 		</dependency>
+
+        <!-- plan common工程依赖 -->
+        <dependency>
+            <groupId>com.bsth.control_v2</groupId>
+            <artifactId>plan_module-common</artifactId>
+            <version>1.0-SNAPSHOT</version>
+        </dependency>
 	</dependencies>
 	<dependencyManagement>
+package com.bsth.entity.schedule.log;
+
+import com.bsth.control_v2.plan_module.common.enums.log.ModuleOperatorType;
+import com.bsth.control_v2.plan_module.common.enums.log.ModuleType;
+import com.bsth.control_v2.plan_module.common.enums.log.OperatorType;
+import com.bsth.entity.schedule.log.convert.ModuleOperatorTypeConverter;
+import com.bsth.entity.schedule.log.convert.ModuleTypeConverter;
+import com.bsth.entity.schedule.log.convert.OperatorTypeConverter;
+
+import javax.persistence.*;
+import java.io.Serializable;
+import java.util.Date;
+
+/**
+ * 模块业务操作日志。
+ */
+@Entity
+@Table(name = "bsth_c_s_op_log")
+public class ModuleOperatorLog implements Serializable {
+
+    /** 主键Id */
+    @Id
+    @GeneratedValue
+    private Long id;
+
+    /** 日志插入时间 */
+    @Column(nullable = false)
+    private Long timestmp;
+
+    /** 模块类型 */
+    @Column(nullable = false)
+    @Convert(converter = ModuleTypeConverter.class)
+    private ModuleType moduleType;
+
+    @Column(nullable = false)
+    @Convert(converter = OperatorTypeConverter.class)
+    private OperatorType operatorType;
+
+    /** 模块操作类型 */
+    @Column(nullable = false)
+    @Convert(converter = ModuleOperatorTypeConverter.class)
+    private ModuleOperatorType moduleOperatorType;
+
+    /** 日志描述 */
+    @Column(nullable = false)
+    private String message;
+
+    /** 日志级别 */
+    @Column(nullable = false)
+    private String levelName;
+    /** 模块业务操作开始时间 */
+    @Column(nullable = false)
+    private Date opStartTime;
+    /** 模块业务操作结束时间 */
+    @Column(nullable = false)
+    private Date opEndTime;
+    /** 模块业务操作人姓名 */
+    @Column(nullable = false)
+    private String opUserName;
+    /** 模块业务操作人工号 */
+    @Column(nullable = false)
+    private String opUserCode;
+    /** 关联的实体class名 */
+    @Column(nullable = false)
+    private String opEntityClass;
+    /** 操作前的实体json */
+    @Column(nullable = false)
+    private String opBeforeJson;
+    /** 操作后的实体json */
+    @Column(nullable = false)
+    private String opAfterJson;
+
+    /** 备用-可选参数1 */
+    private String optArg1;
+    /** 备用-可选参数2 */
+    private String optArg2;
+    /** 备用-可选参数3 */
+    private String optArg3;
+
+    //------------- 客户端信息 -------------//
+    /** 客户端Ip */
+    private String clientIp;
+    /** 客户端游览器 */
+    private String clientBowser;
+    /** 客户端主机信息 */
+    private String clientSystem;
+    /** 获取mac地址 */
+    private String clientMacAddress;
+
+    public Long getId() {
+        return id;
+    }
+
+    public void setId(Long id) {
+        this.id = id;
+    }
+
+    public Long getTimestmp() {
+        return timestmp;
+    }
+
+    public void setTimestmp(Long timestmp) {
+        this.timestmp = timestmp;
+    }
+
+    public ModuleType getModuleType() {
+        return moduleType;
+    }
+
+    public void setModuleType(ModuleType moduleType) {
+        this.moduleType = moduleType;
+    }
+
+    public OperatorType getOperatorType() {
+        return operatorType;
+    }
+
+    public void setOperatorType(OperatorType operatorType) {
+        this.operatorType = operatorType;
+    }
+
+    public ModuleOperatorType getModuleOperatorType() {
+        return moduleOperatorType;
+    }
+
+    public void setModuleOperatorType(ModuleOperatorType moduleOperatorType) {
+        this.moduleOperatorType = moduleOperatorType;
+    }
+
+    public String getMessage() {
+        return message;
+    }
+
+    public void setMessage(String message) {
+        this.message = message;
+    }
+
+    public String getLevelName() {
+        return levelName;
+    }
+
+    public void setLevelName(String levelName) {
+        this.levelName = levelName;
+    }
+
+    public Date getOpStartTime() {
+        return opStartTime;
+    }
+
+    public void setOpStartTime(Date opStartTime) {
+        this.opStartTime = opStartTime;
+    }
+
+    public Date getOpEndTime() {
+        return opEndTime;
+    }
+
+    public void setOpEndTime(Date opEndTime) {
+        this.opEndTime = opEndTime;
+    }
+
+    public String getOpUserName() {
+        return opUserName;
+    }
+
+    public void setOpUserName(String opUserName) {
+        this.opUserName = opUserName;
+    }
+
+    public String getOpUserCode() {
+        return opUserCode;
+    }
+
+    public void setOpUserCode(String opUserCode) {
+        this.opUserCode = opUserCode;
+    }
+
+    public String getOpEntityClass() {
+        return opEntityClass;
+    }
+
+    public void setOpEntityClass(String opEntityClass) {
+        this.opEntityClass = opEntityClass;
+    }
+
+    public String getOpBeforeJson() {
+        return opBeforeJson;
+    }
+
+    public void setOpBeforeJson(String opBeforeJson) {
+        this.opBeforeJson = opBeforeJson;
+    }
+
+    public String getOpAfterJson() {
+        return opAfterJson;
+    }
+
+    public void setOpAfterJson(String opAfterJson) {
+        this.opAfterJson = opAfterJson;
+    }
+
+    public String getOptArg1() {
+        return optArg1;
+    }
+
+    public void setOptArg1(String optArg1) {
+        this.optArg1 = optArg1;
+    }
+
+    public String getOptArg2() {
+        return optArg2;
+    }
+
+    public void setOptArg2(String optArg2) {
+        this.optArg2 = optArg2;
+    }
+
+    public String getOptArg3() {
+        return optArg3;
+    }
+
+    public void setOptArg3(String optArg3) {
+        this.optArg3 = optArg3;
+    }
+
+    public String getClientIp() {
+        return clientIp;
+    }
+
+    public void setClientIp(String clientIp) {
+        this.clientIp = clientIp;
+    }
+
+    public String getClientBowser() {
+        return clientBowser;
+    }
+
+    public void setClientBowser(String clientBowser) {
+        this.clientBowser = clientBowser;
+    }
+
+    public String getClientSystem() {
+        return clientSystem;
+    }
+
+    public void setClientSystem(String clientSystem) {
+        this.clientSystem = clientSystem;
+    }
+
+    public String getClientMacAddress() {
+        return clientMacAddress;
+    }
+
+    public void setClientMacAddress(String clientMacAddress) {
+        this.clientMacAddress = clientMacAddress;
+    }
+}
+package com.bsth.entity.schedule.log.convert;
+
+import com.bsth.control_v2.plan_module.common.enums.log.ModuleOperatorType;
+
+import javax.persistence.AttributeConverter;
+import javax.persistence.Convert;
+
+@Convert
+public class ModuleOperatorTypeConverter implements AttributeConverter<ModuleOperatorType, String> {
+    @Override
+    public String convertToDatabaseColumn(ModuleOperatorType attribute) {
+        return attribute.getDicDesc();
+    }
+
+    @Override
+    public ModuleOperatorType convertToEntityAttribute(String dbData) {
+        return ModuleOperatorType.fromDicDesc(dbData);
+    }
+}
+package com.bsth.entity.schedule.log.convert;
+
+import com.bsth.control_v2.plan_module.common.enums.log.ModuleType;
+
+import javax.persistence.AttributeConverter;
+import javax.persistence.Convert;
+
+@Convert
+public class ModuleTypeConverter implements AttributeConverter<ModuleType, String> {
+    @Override
+    public String convertToDatabaseColumn(ModuleType attribute) {
+        return attribute.getDicDesc();
+    }
+
+    @Override
+    public ModuleType convertToEntityAttribute(String dbData) {
+        return ModuleType.fromDicDesc(dbData);
+    }
+}
+package com.bsth.entity.schedule.log.convert;
+
+import com.bsth.control_v2.plan_module.common.enums.log.OperatorType;
+
+import javax.persistence.AttributeConverter;
+import javax.persistence.Convert;
+
+@Convert
+public class OperatorTypeConverter implements AttributeConverter<OperatorType, String> {
+    @Override
+    public String convertToDatabaseColumn(OperatorType attribute) {
+        return attribute.getDicDesc();
+    }
+
+    @Override
+    public OperatorType convertToEntityAttribute(String dbData) {
+        return OperatorType.fromDicDesc(dbData);
+    }
+}
@@ -46,7 +46,8 @@ public interface YlbRepository extends BaseRepository&lt;Ylb, Integer&gt;{
 			+ " and y.xlbm like %?4%  and y.nbbm like %?5%",nativeQuery=true)
 	List<Ylb> listMaxRqJcsx(String rq,String gsbm,String fgsbm,String xlbm,String nbbm);
-	@Query(value="select * from bsth_c_ylb where to_days(?1) -to_days(rq) <30 "
+	@Query(value="select * from bsth_c_ylb where "
+			+ " DATE_SUB(CURDATE(), INTERVAL 30 DAY) <= rq "
 			+ " and rq< ?1 and ssgsdm like %?2%"
 			+ " and fgsdm like %?3% and xlbm like %?4% and nbbm like %?5% "
 			+ " order by nbbm , rq desc,jcsx desc,lp desc",nativeQuery=true)
@@ -125,6 +126,12 @@ public interface YlbRepository extends BaseRepository&lt;Ylb, Integer&gt;{
 	List<Object[]> checkNbmmYl(String rq, String gsbm,String fgsbm,String xlbm,String nbbm);
+	@Query(value="select nbbm,cs from (select nbbm,count(nbbm) as cs from ("
+			+ " select nbbm,fgsdm from bsth_c_ylb where rq=?1 "
+			+ " and ssgsdm like %?2% group by nbbm,fgsdm "
+			+ " ) t group by t.nbbm) x where x.cs >1 ",nativeQuery=true)
+	List<Object[]> checkNbmmFgs(String rq, String gsbm);
+	
 	@Query(value="select jzl,yh,sh from Ylb s "
 			+ " where to_days(s.rq)=to_days(?1)  "
 			+ " and s.ssgsdm like %?2% "
@@ -12,6 +12,7 @@ import com.bsth.data.pilot80.PilotReport;
 import com.bsth.data.safe_driv.SafeDriv;
 import com.bsth.data.safe_driv.SafeDrivCenter;
 import com.bsth.data.schedule.DayOfSchedule;
+import com.bsth.entity.Line;
 import com.bsth.entity.LineVersions;
 import com.bsth.entity.directive.D80;
 import com.bsth.entity.realcontrol.ScheduleRealInfo;
@@ -252,14 +253,19 @@ public class GpsServiceImpl implements GpsService {
         for(Map<String, Object> rs : dataList){
             int index=dataList.indexOf(rs);
             if (index< dataList.size()-1&&!map_get_str( rs,"LINE_ID").equals(map_get_str( dataList.get(index+1),"LINE_ID"))){
+
+                Line cLine =lineRepository.findOne(Integer.valueOf(map_get_str( rs,"LINE_ID")));
+                Line nextLine =lineRepository.findOne(Integer.valueOf(map_get_str( dataList.get(index+1),"LINE_ID")));
+                if (cLine!=null&&nextLine!=null){
                 Map<String,Object> LSmap=new HashMap<>();
-                String name=lineRepository.findOne(Integer.valueOf(map_get_str( rs,"LINE_ID"))).getName();
-                String NextName=lineRepository.findOne(Integer.valueOf(map_get_str( dataList.get(index+1),"LINE_ID"))).getName();
+                String name=cLine.getName();
+                String NextName=nextLine.getName();
                 LSmap.put("abnormalType","linesSwitch");
                 LSmap.put("line_line",name+"-->"+NextName);
                 LSmap.put("st",map_get_long(rs, "TS"));
                 LSmap.put("et",index== dataList.size()-1?map_get_long(rs, "TS"):map_get_long( dataList.get(index+1), "TS"));
                 lineSwitch.add(LSmap);
+                }
             }
             serviceState = map_get_long(rs, "SERVICE_STATE");
             if(getGpsValid(serviceState) == 1){
@@ -291,6 +291,26 @@ public class YlbServiceImpl extends BaseServiceImpl&lt;Ylb,Integer&gt; implements YlbS
 			String sxtj=map2.get("sxtj").toString();
 			if(sxtj.equals("0")){
 				listpb=listpbs;
+			}else if (sxtj.equals("5")){
+					List<String> stringList=new ArrayList<String>();
+
+					List<Object[]> objectLists = repository.checkNbmmFgs(rq, gsbm);
+					for (int i = 0; i < objectLists.size(); i++) {
+						String clbm=objectLists.get(i)[0].toString();
+						stringList.add(clbm);
+					}
+					
+					for (int i = 0; i < stringList.size(); i++) {
+						String strNbbm=stringList.get(i);
+						for (int j = 0; j < listpbs.size(); j++) {
+							Map<String, Object> map = listpbs.get(j);
+							String mapNbbm=map.get("clZbh").toString();
+							if(strNbbm.equals(mapNbbm)){
+								listpb.add(map);
+							}
+						}
+					}
+					
 			}else{
 				List<Object[]> objectLists=repository.checkNbmmNum(rq, gsbm, fgsbm, "",nbbm);
 				List<String> stringList=new ArrayList<String>();
@@ -1269,6 +1289,19 @@ public class YlbServiceImpl extends BaseServiceImpl&lt;Ylb,Integer&gt; implements YlbS
 						else
 							listYlb = repository.listYlb_s(sdf.parse(rq+" 00:00:00"), gsbm, fgsbm, xlbm, stringList);
 					}
+				}else if(sxtj.equals("5")){
+					List<Object[]> objectLists = repository.checkNbmmFgs(rq, gsbm);
+					for (int i = 0; i < objectLists.size(); i++) {
+						String clbm =objectLists.get(i)[0].toString();
+						stringList.add(clbm);
+					}
+					
+					if (stringList.size() > 0) {
+						if (type.equals("1"))
+							listYlb = repository.listYlb(rq, gsbm, fgsbm, xlbm, stringList);
+						else
+							listYlb = repository.listYlb_s(sdf.parse(rq+" 00:00:00"), gsbm, fgsbm, xlbm, stringList);
+					}
 				} else {
 					List<Object[]> objectLists;
 					if (sxtj.equals("3")) {
@@ -590,6 +590,11 @@ public class ScheduleRealInfoServiceImpl extends BaseServiceImpl&lt;ScheduleRealInf
             //计算班次实际执行时间
             schAttrCalculator.calcRealDate(t).calcAllTimeByFcsj(t);
+            //处理计达跨24点
+            LineConfig conf = lineConfigData.get(t.getXlBm());
+            if (t.getZdsj().compareTo(conf.getStartOpt()) < 0) {
+                t.setZdsjT(sdfyyyyMMddHHmm.parse(t.getScheduleDateStr() + t.getZdsj()).getTime() + (1000 * 60 * 60 * 24));
+            }
             if (t.getZdsjT() < t.getFcsjT()) {
                 rs.put("status", ResponseCode.ERROR);
                 rs.put("msg", "起终点时间异常！");
@@ -454,6 +454,19 @@ public class TTInfoDetailDataToolsImpl implements DataToolsService, TTInfoDetail
         StationRoute station1 = stationRouteService.findById(lpObjList.get(0).getStationRouteId1());
         StationRoute station2 = stationRouteService.findById(lpObjList.get(1).getStationRouteId2());
+
+        // TODO
+        Map<String, Object> param = new HashMap<>();
+        param.put("station.id_eq", null);
+        if (station1 == null) {
+            param.put("station.id_eq", lpObjList.get(0).getStationRouteId1());
+            station1 = ((List<StationRoute>) stationRouteService.list(param)).get(0);
+        }
+        if (station2 == null) {
+            param.put("station.id_eq", lpObjList.get(0).getStationRouteId2());
+            station2 = ((List<StationRoute>) stationRouteService.list(param)).get(0);
+        }
+
         for (int i = 0; i < groupCount; i++) {
             excelPoiOperator.createStringCell(wb, lpHeadRow, (short) (i * 2 + 1), station1.getStationName(), new Color(0x96b9d7));
             excelPoiOperator.createStringCell(wb, lpHeadRow, (short) (i * 2 + 2), station2.getStationName(), new Color(0x96b9d7));
@@ -566,6 +579,19 @@ public class TTInfoDetailDataToolsImpl implements DataToolsService, TTInfoDetail
         StationRoute station1 = stationRouteService.findById(lpObjList.get(0).getStationRouteId1());
         StationRoute station2 = stationRouteService.findById(lpObjList.get(1).getStationRouteId2());
+
+        // TODO
+        Map<String, Object> param = new HashMap<>();
+        param.put("station.id_eq", null);
+        if (station1 == null) {
+            param.put("station.id_eq", lpObjList.get(0).getStationRouteId1());
+            station1 = ((List<StationRoute>) stationRouteService.list(param)).get(0);
+        }
+        if (station2 == null) {
+            param.put("station.id_eq", lpObjList.get(0).getStationRouteId2());
+            station2 = ((List<StationRoute>) stationRouteService.list(param)).get(0);
+        }
+
         for (int i = 1; i <= groupCount; i++) {
             excelPoiOperator.createStringCell(wb, lpHeadRow, (short) (i * 2 + 1), station1.getStationName(), new Color(0x96b9d7));
             excelPoiOperator.createStringCell(wb, lpHeadRow, (short) (i * 2 + 2), station2.getStationName(), new Color(0x96b9d7));
@@ -644,7 +670,9 @@ public class TTInfoDetailDataToolsImpl implements DataToolsService, TTInfoDetail
                             cell.setCellValue(bcObj.getFcsj() + "X");
                         } else { // 一个车次链
                             cell = lpRow.getCell((short) (bcObj.getGroupNo() * 2 + bcObj.getGroupBcNo() + 3));
-                            cell.setCellValue(bcObj.getFcsj() + "X");
+                            if (cell != null) {
+                                cell.setCellValue(bcObj.getFcsj() + "X");
+                            }
                         }
                         break;
                     case LC:
+package com.bsth.service.schedule.log;
+
+import ch.qos.logback.classic.spi.ILoggingEvent;
+import ch.qos.logback.core.db.DBAppenderBase;
+import ch.qos.logback.core.db.DBHelper;
+import com.bsth.control_v2.plan_module.common.exception.PlanModuleException;
+import com.bsth.entity.schedule.log.ModuleOperatorLog;
+
+import java.lang.reflect.Method;
+import java.sql.Connection;
+import java.sql.Date;
+import java.sql.PreparedStatement;
+
+/**
+ * 自定义模块业务操作日志logback自定义appender。
+ */
+public class ModuleOperatorDbAppender extends DBAppenderBase<ILoggingEvent> {
+    /** JDBC3.0中的绑定表自增的主键值，获取result需要此方法 */
+    protected static final Method GET_GENERATED_KEYS_METHOD;
+    /** 插入日志sql */
+    protected static final String INSERT_SQL;
+
+    @Override
+    public void start() {
+        super.start();
+    }
+
+    @Override
+    protected Method getGeneratedKeysMethod() {
+        return GET_GENERATED_KEYS_METHOD;
+    }
+
+    @Override
+    protected String getInsertSQL() {
+        return INSERT_SQL;
+    }
+
+    @Override
+    protected void subAppend(ILoggingEvent iLoggingEvent, Connection connection, PreparedStatement insertStatement) throws Throwable {
+        // 参数判定，第一个参数必须是ModuleOperatorLog，后续的参数最多取3个
+        if (iLoggingEvent.getArgumentArray().length == 0) {
+            throw new PlanModuleException(iLoggingEvent.getLoggerName() + "日志参数必须大于1");
+        } else {
+            Object arg1 = iLoggingEvent.getArgumentArray()[0];
+            if (!(arg1 instanceof ModuleOperatorLog)) {
+                throw new PlanModuleException(iLoggingEvent.getLoggerName() + "日志第一个参数必须是ModuleOperatorLog类型");
+            } else {
+                ModuleOperatorLog arg1_log = (ModuleOperatorLog) arg1;
+                // insertStatement设定ModuleOperatorLog关联数据
+                insertStatement.setLong(1, iLoggingEvent.getTimeStamp());
+                insertStatement.setString(2, arg1_log.getModuleType().getDicDesc());
+                insertStatement.setString(3, arg1_log.getOperatorType().getDicDesc());
+                insertStatement.setString(4, arg1_log.getModuleOperatorType().getDicDesc());
+                insertStatement.setString(5, arg1_log.getMessage());
+                insertStatement.setString(6, iLoggingEvent.getLevel().levelStr);
+                insertStatement.setDate(7, new Date(arg1_log.getOpStartTime().getTime()));
+                insertStatement.setDate(8, new Date(arg1_log.getOpEndTime().getTime()));
+                insertStatement.setString(9, arg1_log.getOpUserName());
+                insertStatement.setString(10, arg1_log.getOpUserCode());
+                insertStatement.setString(11, arg1_log.getOpEntityClass());
+                insertStatement.setString(12, arg1_log.getOpBeforeJson());
+                insertStatement.setString(13, arg1_log.getOpAfterJson());
+                insertStatement.setString(14, "");
+                insertStatement.setString(15, "");
+                insertStatement.setString(16, "");
+
+                for (int i = 1; i < iLoggingEvent.getArgumentArray().length; i++) {
+                    if (i == 1) {
+                        insertStatement.setString(14, iLoggingEvent.getArgumentArray()[i].toString());
+                    } else if (i == 2) {
+                        insertStatement.setString(15, iLoggingEvent.getArgumentArray()[i].toString());
+                    } else if (i == 3) {
+                        insertStatement.setString(16, iLoggingEvent.getArgumentArray()[i].toString());
+                    } else {
+                        break;
+                    }
+                }
+
+                int updateCount = insertStatement.executeUpdate();
+                if (updateCount != 1) {
+                    addWarn("Failed to insert loggingEvent");
+                }
+            }
+        }
+
+    }
+
+    @Override
+    protected void secondarySubAppend(ILoggingEvent iLoggingEvent, Connection connection, long l) throws Throwable {
+        // TODO：
+    }
+
+    @Override
+    public void append(ILoggingEvent eventObject) {
+        Connection connection = null;
+        PreparedStatement insertStatement = null;
+        try {
+            connection = this.connectionSource.getConnection();
+            connection.setAutoCommit(false);
+            insertStatement = connection.prepareStatement(INSERT_SQL);
+            synchronized (this) {
+                subAppend(eventObject, connection, insertStatement);
+            }
+            // TODO：可能以后需要secondarySubAppend
+
+            connection.commit();
+        } catch (Throwable exp) {
+            exp.printStackTrace();
+            this.addError("problem appending event", exp);
+        } finally {
+            DBHelper.closeStatement(insertStatement);
+            DBHelper.closeConnection(connection);
+        }
+    }
+
+    static {
+        StringBuilder sql = new StringBuilder();
+        sql.append("insert into bsth_c_s_op_log (");
+        sql.append("timestmp, ");
+        sql.append("module_type, ");
+        sql.append("operator_type, ");
+        sql.append("module_operator_type, ");
+        sql.append("message, ");
+        sql.append("level_name, ");
+        sql.append("op_start_time, ");
+        sql.append("op_end_time, ");
+        sql.append("op_user_name, ");
+        sql.append("op_user_code, ");
+        sql.append("op_entity_class, ");
+        sql.append("op_before_json, ");
+        sql.append("op_after_json, ");
+        sql.append("opt_arg1, ");
+        sql.append("opt_arg2, ");
+        sql.append("opt_arg3) ");
+        sql.append(" values (?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?)");
+        INSERT_SQL = sql.toString();
+
+        Method getGeneratedKeysMethod;
+        try {
+            getGeneratedKeysMethod = PreparedStatement.class.getMethod("getGeneratedKeys", (Class[])null);
+        } catch (Exception exp) {
+            getGeneratedKeysMethod = null;
+        }
+
+        GET_GENERATED_KEYS_METHOD = getGeneratedKeysMethod;
+    }
+}
+package com.bsth.service.schedule.log;
+
+import com.bsth.control_v2.plan_module.common.dto.schedule.PlanInfoDto;
+import com.bsth.control_v2.plan_module.common.enums.log.ModuleOperatorType;
+import com.bsth.control_v2.plan_module.common.enums.log.ModuleType;
+import com.bsth.control_v2.plan_module.common.enums.log.OperatorType;
+import com.bsth.entity.schedule.SchedulePlan;
+import com.bsth.entity.schedule.log.ModuleOperatorLog;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+import org.springframework.stereotype.Service;
+
+import java.util.Date;
+
+/**
+ * 排班计划日志。
+ */
+@Service
+public class PlanLogger {
+    /** 日志记录器 */
+    private static final Logger LOGGER = LoggerFactory.getLogger(PlanLogger.class);
+
+    /**
+     * 生成排班计划日志。
+     * @param startTime 操作开始时间
+     * @param endTime 操作结束时间
+     */
+    public void createLog(Date startTime, Date endTime) {
+        ModuleOperatorLog moduleOperatorLog = new ModuleOperatorLog();
+        moduleOperatorLog.setMessage("排班生成！");
+        moduleOperatorLog.setModuleType(ModuleType.SCHEDULE);
+        moduleOperatorLog.setOperatorType(OperatorType.NEW);
+        moduleOperatorLog.setModuleOperatorType(ModuleOperatorType.SCHEDULE_NEW);
+        moduleOperatorLog.setOpStartTime(startTime);
+        moduleOperatorLog.setOpEndTime(endTime);
+        moduleOperatorLog.setOpUserName("root");
+        moduleOperatorLog.setOpUserCode("root");
+        moduleOperatorLog.setOpEntityClass(SchedulePlan.class.getName());
+        moduleOperatorLog.setOpBeforeJson("{}");
+        moduleOperatorLog.setOpAfterJson("{}");
+
+        // 如果需要opArg1,opArg2,opArg3，从第2个参数加起，如：LOGGER.info("", {moduleOperatorLog}, {opArg1}, {opArg2})
+        LOGGER.info("排班计划生成日志：{}", moduleOperatorLog);
+    }
+
+    /**
+     * 修改排班计划明细日志。
+     * @param startTime 操作开始时间
+     * @param beforeData 修改前数据
+     * @param endTime 操作结束时间
+     * @param afterData 修改后数据
+     */
+    public void modifyInfoLog(Date startTime, PlanInfoDto beforeData, Date endTime, PlanInfoDto afterData) {
+        // TODO：
+    }
+}
+package com.bsth.service.schedule.log;
+
+import com.bsth.control_v2.plan_module.common.dto.schedule.timetable.TTInfoDetailDto;
+import com.bsth.control_v2.plan_module.common.dto.schedule.timetable.TTInfoDto;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+import org.springframework.stereotype.Service;
+
+import java.util.Date;
+
+/**
+ * 时刻表日志。
+ */
+@Service
+public class TimetableLogger {
+    /** 日志记录器 */
+    private static final Logger LOGGER = LoggerFactory.getLogger(TimetableLogger.class);
+
+    /**
+     * 生成时刻表模版日志。
+     * @param startTime 操作开始时间
+     * @param endTime 操作结束时间
+     */
+    public void createTTLog(Date startTime, Date endTime) {
+        // TODO：
+    }
+
+    /**
+     * 修改时刻表模版日志。
+     * @param startTime 操作开始时间
+     * @param beforeData 修改前数据
+     * @param endTime 操作结束时间
+     * @param afterData 修改后数据
+     */
+    public void modifyTTLog(Date startTime, TTInfoDto beforeData, Date endTime, TTInfoDto afterData) {
+        // TODO：
+    }
+
+    /**
+     * 导入时刻表明细日志。
+     * @param startTime 操作开始时间
+     * @param endTime 操作结束时间
+     */
+    public void importTTDLog(Date startTime, Date endTime) {
+        // TODO：导入前备份一次，导入后备份一次，备份前后的id放入before和after中
+    }
+
+    /**
+     * 修改时刻表明细日志。
+     * @param startTime 操作开始时间
+     * @param beforeData 修改前数据
+     * @param endTime 操作结束时间
+     * @param afterData 修改后数据
+     */
+    public void modifyTTDLog(Date startTime, TTInfoDetailDto beforeData, Date endTime, TTInfoDetailDto afterData) {
+        // TODO：
+    }
+}
@@ -16,7 +16,7 @@ var platform = process.platform;
 var iswin = platform == 'win32';
 var sp = platform == 'win32' ? '\\' : '/';
 //不参与的目录
-var excludes = ['scheduleApp', 'trafficManage', 'control', 'permission' + sp + 'authorize_all', 'summary', 'history_sch', 'report' + sp + 'oil', 'base' + sp + 'geo_data_edit', 'base' + sp + 'carpark', 'forms', 'mforms', 'report', 'punctual', 'base' + sp + 'timesmodel']
+var excludes = ['scheduleApp', 'trafficManage', 'control', 'permission' + sp + 'authorize_all','permission' + sp + 'user', 'summary', 'history_sch', 'report' + sp + 'oil', 'base' + sp + 'geo_data_edit', 'base' + sp + 'carpark', 'forms', 'mforms', 'report', 'punctual', 'base' + sp + 'timesmodel']
     , ep = new EventProxy()
     , pName = 'bsth_control'
     , path = process.cwd()
@@ -160,6 +160,46 @@
 	</logger>
+    <!-- 时刻表，排班计划业务修改日志 -->
+    <!--<springProfile name="dev">-->
+        <!--<appender name="MYDB" class="com.bsth.service.schedule.log.ModuleOperatorDbAppender">-->
+            <!--<connectionSource class="ch.qos.logback.core.db.DataSourceConnectionSource">-->
+                <!--<dataSource class="org.apache.commons.dbcp.BasicDataSource">-->
+                    <!--<driverClassName>com.mysql.jdbc.Driver</driverClassName>-->
+                    <!--<url>-->
+                        <!--<![CDATA[-->
+                            <!--jdbc:mysql://127.0.0.1/test_control?useUnicode=true&characterEncoding=utf-8&useSSL=false-->
+                        <!--]]>-->
+                    <!--</url>-->
+                    <!--<username>root</username>-->
+                    <!--<password></password>-->
+                    <!--<testOnBorrow>true</testOnBorrow>-->
+                    <!--<validationQuery>-->
+                        <!--<![CDATA[-->
+                            <!--SELECT 1-->
+                        <!--]]>-->
+                    <!--</validationQuery>-->
+                <!--</dataSource>-->
+            <!--</connectionSource>-->
+        <!--</appender>-->
+    <!--</springProfile>-->
+
+    <!--<appender name="ASYNC_MYDB" class="ch.qos.logback.classic.AsyncAppender">-->
+        <!--&lt;!&ndash; 不丢失日志.默认的,如果队列的80%已满,则会丢弃TRACT、DEBUG、INFO级别的日志 &ndash;&gt;-->
+        <!--<discardingThreshold >0</discardingThreshold>-->
+        <!--&lt;!&ndash; 更改默认的队列的深度,该值会影响性能.默认值为256 &ndash;&gt;-->
+        <!--<queueSize>512</queueSize>-->
+        <!--&lt;!&ndash; 添加附加的appender,最多只能添加一个 &ndash;&gt;-->
+        <!--<appender-ref ref ="MYDB"/>-->
+    <!--</appender>-->
+
+    <!--<logger name="com.bsth.service.schedule.log.PlanLogger"-->
+            <!--level="INFO" additivity="false">-->
+        <!--<appender-ref ref="ASYNC_MYDB" />-->
+    <!--</logger>-->
+
+    <!-- TODO -->
+
 	<!-- gps -->
 	<appender name="GPS_COUNT"
 			  class="ch.qos.logback.core.rolling.RollingFileAppender">
@@ -3,7 +3,7 @@
 	if (!$('body').hasClass('page-sidebar-closed')) {
 		$('.menu-toggler.sidebar-toggler').click();
 	}
-	
+
 	$('.openHaveSkb').on('click',function() {
 		var skbId = $("#skbNameSelect").val();
 		var argus = {
@@ -66,6 +66,8 @@
 			CSMap = getMaxCarAndStopSpace0(map,seMap);
             // 发车间隙
             map.fcjx = CSMap.fcjx;
+            map.stt = "1";
+            _paramObj = Main_v2.getFactory().createParameterObj(map, dataMap);
 		}else if(map.baseRes== '1') {
 			CSMap = getMaxCarAndStopSpace1(map);
             // 发车间隙
@@ -144,7 +146,7 @@
         // // 初始化右键菜单.
         // contextInit(graph);
-        if (map.baseRes == '3' || map.baseRes == '1') {
+        if (map.baseRes == '3' || map.baseRes == '1' || map.baseRes == '0') {
             // 导入导出设置
             // Main_v2_2.exportExcelConfig($_GlobalGraph.getDataArray);
@@ -581,10 +581,10 @@ var Main_v2_2_ExcelObj = (function() {
                         "zdzid": oGanttBc.zdz, // 终点站id
                         "isUp": bIsUp, // 是否上行
-                        "isFb": null, // 是否分班（_resetBdOutInLcBcGroup方法修正）
+                        "isFb": false, // 是否分班（_resetBdOutInLcBcGroup方法修正）
                         "bcType": oGanttBc.bcType, // 班次类型（bc、out、in、lc）
-                        "fcsj": oGanttBc.fcsj, // 发车时间描述
+                        "fcsj": (oGanttBc.fcsj == null ? "" : oGanttBc.fcsj), // 发车时间描述
                         "groupNo": -99, // 第几圈（_resetBdOutInLcBcGroup方法修正）
                         "groupBcNo": -99, // 圈里第几个班次（_resetBdOutInLcBcGroup方法修正）
@@ -43,7 +43,7 @@ var Main_v2_2 = function() {
             schedule.fnAdjustHeadway();
             // 4、计算吃饭班次
             schedule.fnCalcuEatBc();
-            // // 6、计算末班车
+            // // 6、计算末班车（TODO：这里家里末班车，貌似导出Excel会报错，待修正）
             // schedule.fnCalcuLastBc();
             // 7、重新设置停站时间
             schedule.fnReSetLayoverTime();
@@ -64,8 +64,8 @@ var Main_v2_2 = function() {
          * 导出时刻表配置。
          * @param fnGetGanttBc 获取gantt班次方法
          */
-        exportExcelConfig: function(fnGetGanttBc) {
-            var oExcel = new Main_v2_2_ExcelObj(_paramObj, fnGetGanttBc);
+        exportExcelConfig: function(paramobj, fnGetGanttBc) {
+            var oExcel = new Main_v2_2_ExcelObj(paramobj, fnGetGanttBc);
             $('.exportAddXls').off('click');
             $('.exportAddXlsx').off('click');
@@ -59,26 +59,40 @@
     }
 </style>
 <div class="system_change_log">
-    <h2 style="text-indent: 35px;margin: 10px 0 5px;">2018-08-23 更新说明 Changelog</h2>
+    <h2 style="text-indent: 35px;margin: 10px 0 5px;">2019-04-11 更新说明 Changelog</h2>
     <br><br>
     <ul >
+        <li class="sub_title"><h6>权限管理</h6></li>
+        <li><span class="label s_c_change">修复</span>1、编辑某一个员工，用户、角色和授权管理设置在同一界面。</li>
+        <li><span class="label s_c_change">新增</span>2、用户增加一项状态，显示主调、监控和作废。</li>
+        <li class="sub_title"><h6>线调</h6></li>
+        <li><span class="label s_c_change">新增</span>1、少量班次对换完成用颜色标记为已换。</li>
+        <li><span class="label s_c_change">新增</span>2、子任务可最小化。</li>
+        <li><span class="label s_c_change">修复</span>3、修正子任务一个备注栏原因选择后其他子任务都会同步备注此原因。</li>
+        <li><span class="label s_c_change">修复</span>4、轨迹回放只显示当前一段时间内的gps走向，已轨迹回放的走向自动不显示（只显示当前上下行的gps走向）。</li>
+        <li><span class="label s_c_change">修复</span>5、轨迹回放播放速度添加更多倍速播放可选。</li>
+        <li><span class="label s_c_change">新增</span>6、"线路配置"分割成"线路配置"、"翻班与自动执行"，可独立授权。</li>
+        <li><span class="label s_c_change">新增</span>7、添加设置，选择是否显示应到实到误差时间。</li>
+        <li><span class="label s_c_change">修复</span>8、无发有到时间 为紫色完成状态，改为显眼颜色区分，用橙色区分。</li>
+        <li><span class="label s_c_change">修复</span>9、轨迹回放中根据时间点切换线路版本信息。</li>
+        <li><span class="label s_c_change">修复</span>10、路牌对调连续请求造成数据不一致，翻班时无法清楚前日的排班数据。</li>
         <li class="sub_title"><h6>计划调度</h6></li>
-        <li><span class="label s_c_change">修复</span>1、添加新的排班验证规则，如果当天的时刻表有的路牌在排班数据中没有，提示错误。</li>
-        <li><span class="label s_c_change">修复</span>2、修改车辆（或人员）时，判定是否属于当前用户所属分公司中，不属于提示错误，允许继续保存。</li>
-        <li><span class="label s_c_change">修复</span>3、修改车辆时（或人员）时，判定是否属于当前用户所属公司中，不属于显示警告信息，不能保存。</li>
-        <li class="sub_title"><h6>运管处平台</h6></li>
-        <li><span class="label s_c_change">修复</span>1、上传时刻表时，记录时刻表对应的版本号以及该版本对应的历史站点路由信息。</li>
-        <li><span class="label s_c_change">修复</span>2、上传时刻表时，针对线路编码、时刻表执行时间、首末站点名称，首末站点序号这几个要素做出判断，不符合要求的要素做出相应的提示。</li>
+        <li><span class="label s_c_change">修复</span>1、车辆报废，释放设备编号后在设备管理里添加一条设备替换记录。</li>
+        <li><span class="label s_c_change">修复</span>2、线路值勤日报，修改班次时，跨线路修改班次车提示报警。</li>
+        <li><span class="label s_c_change">修复</span>3、增加公司，分公司查询条件，公司，分公司，线路都是跟登录用户权限的,导出的数据和查询条件一致。</li>
+        <li><span class="label s_c_change">修复</span>4、排班时，页面添加规则逻辑判定。</li>
+        <li><span class="label s_c_change">修复</span>5、车辆导出修正，导出内容和权限匹配，和搜索条件匹配。</li>
+        <li><span class="label s_c_change">新增</span>6、所有的页面搜索添加排序选项功能。</li>
+        <li><span class="label s_c_change">新增</span>7、新增计划排班预览功能。</li>
         <li class="sub_title"><h6>统计报表</h6></li>
-        <li><span class="label s_c_change">修复</span>1、对集群调度系统“报表管理”中各类统计报表（只提供单线汇总统计的报表除外），增设线路性质区分统计功能选项，按“全部线路”、“营运线路”、“非营运线路”进行区分，且默认选项为“营运线路”）。</li>
-        <li><span class="label s_c_change">修复</span>2、对集群调度系统“报表管理”中各类统计报表（只提供单线汇总统计的报表除外），增设四家直属公司统计选项。</li>
-        <li><span class="label s_c_change">修复</span>3、在“营运线路出车率统计表”中，增加早高峰出车率统计项，计算公式：早高峰实际出车数/线路计划配车数。</li>
-        <li><span class="label s_c_change">修复</span>4、发车准点率中加入到站准点率，统计班次为首站发车为起点站的班次。</li>
-        <li><span class="label s_c_change">修复</span>5、统计日报调度日报烂班详细统计标准以“调度日报”为准。</li>
-        <li class="sub_title"><h6>线调</h6></li>
-        <li><span class="label s_c_change">修复</span>1、修正一个线调bug，这个bug导致部分套跑班车的车辆，一定几率会出现车载线路无法正常切换问题。</li>
+        <li><span class="label s_c_change">新增</span>1、新增早高峰出车报表。</li>
+        <li><span class="label s_c_change">新增</span>2、新增调度日报（待发对比） 报表。</li>
+        <li><span class="label s_c_change">新增</span>3、新增路单数据统计报表。</li>
+        <li><span class="label s_c_change">修复</span>4、修正班次车辆人员日报表中的售票员统计。</li>
         <li class="sub_title"><h6>基础信息</h6></li>
-        <li><span class="label s_c_change">修复</span>1、车辆设备管理，只有新增，没有修改、作废，启用日期使用保存的时间。</li>
-        <li><span class="label s_c_change">修复</span>2、线路相关问题优化(站点缓冲区修改多边形中心点可拖动，可以修改为圆形、修改后定位、线路文件上传可填写版本)。</li>
+        <li><span class="label s_c_change">修复</span>1、线路版本：待更新状态增加删除功能，历史版本取消修改功能。</li>
+        <li><span class="label s_c_change">修复</span>2、线路信息-站点详情列-详情页面-站点修改功能：站点修改多边形功能修改，站点中心点可以移动。</li>
+        <li class="sub_title"><h6>用油管理</h6></li>
+        <li><span class="label s_c_change">修复</span>1、修正加油人员不符保存后不在显示。</li>
     </ul>
 </div>
@@ -149,6 +149,7 @@
 									<option value="2">一车多单</option>
 									<option value="3">有加油没里程</option>
 									<option value="4">有里程没加油</option>
+									<option value="5">跨分工用车</option>
 								</select>
 							</div>
@@ -661,12 +662,17 @@ onkeyup=&quot;this.value=this.value.replace(/[^(\d||/.)]/g,&#39;&#39;).replace(&#39;.&#39;,&#39;$#$&#39;).rep
         $('tr.filter .filter-submit').on('click', function () {
         	 var ylbGsdm=$("#ylbListGsdmId").val();
      		var ylbFgsdm=$("#ylbListFgsdmId").val();
+     		var nbbm=$("#nbbm").val();
             if ($("#rq").val() == "" || $("#rq").val() ==null){
             	  layer.msg('请选择日期.');
-            }else if(ylbGsdm=="" || ylbGsdm==null||ylbFgsdm==null){
+            }else if(ylbGsdm=="" || ylbGsdm==null){
 //             	 || ylbFgsdm=="" 
-            	 layer.msg('请选择公司和分公司.');
-            }else {
+            	 layer.msg('请选择公司');
+            }
+            /* else if( (ylbFgsdm==""||ylbFgsdm==null)  && (nbbm=="" || nbbm==null) ){
+            	layer.msg('不选择分公司处理输入车辆自编号');
+            } */
+            else {
             	 var params = getParamsList();
                 page = 0;
                 jsDoQuery(params, true);
-<!DOCTYPE html>
+<!--<!DOCTYPE html>-->
 <html lang="zh-cn">
 <head>
     <meta charset="UTF-8">
+    <script src="/metronic_v4.5.4/plugins/jquery.min.js"></script>
+    <script src="/assets/js/common.js"></script>
+    <script src="/assets/plugins/uk3.0/uikit.min.js"></script>
+    <script src="/assets/plugins/uk3.0/uikit-icons.min.js"></script>
+    <script src="/real_control_v2/assets/plugins/perfect-scrollbar/perfect-scrollbar.jquery.js"></script>
+    <!-- EventProxy  -->
+    <script src="/assets/js/eventproxy.js"></script>
+    <!-- art-template 模版引擎 -->
+    <script src="/assets/plugins/template.js"></script>
+    <script src="/real_control_v2/assets/plugins/moment/moment.min.js"></script>
+    <script src="/assets/plugins/ztree_v3/js/jquery.ztree.core.min.js"></script>
+    <script src="/assets/plugins/ztree_v3/js/jquery.ztree.excheck.min.js"></script>
     <link rel="stylesheet" href="/assets/plugins/uk3.0/uikit.min.css"/>
     <link rel="stylesheet" href="/real_control_v2/assets/plugins/perfect-scrollbar/perfect-scrollbar.css" />
     <link rel="stylesheet" href="/assets/plugins/ztree_v3/css/zTreeStyle/zTreeStyle.css" />
     <style>
-        html,body{
-            height: 100%;
-        }
-        .ct_page{
-            padding: 25px 15px;
-            height: 100%;
-            height: calc(100% - 50px);
-        }
+    html,body{
+    height: 100%;
+    }
+    .ct_page{
+    padding: 25px 15px;
+    height: 100%;
+    height: calc(100% - 50px);
+    }
-        .ct_cont{
-            height: calc(100% - 41px);
-        }
+    .ct_cont{
+    height: calc(100% - 41px);
+    }
-        .ct_cont>div>div.uk-card{
-            height: 99%;
-        }
+    .ct_cont>div>div.uk-card{
+    height: 99%;
+    }
-        form .uk-inline{
-            width: calc(100% - 4px);
-            margin-left: 2px;
-        }
+    form .uk-inline{
+    width: calc(100% - 4px);
+    margin-left: 2px;
+    }
-        .ct-card-body{
-            overflow: auto;
-            padding: 1px 1px 0 2px;
-            height: calc(100% - 54px);
-            position: relative;
-            margin-top: -12px;
-        }
+    .ct-card-body{
+    overflow: auto;
+    padding: 1px 1px 0 2px;
+    height: calc(100% - 54px);
+    position: relative;
+    margin-top: -12px;
+    }
-        .ct_li_desc{
-            color: #a8a8a8;
-            font-size: 13px;
-        }
+    .ct_li_desc{
+    color: #a8a8a8;
+    font-size: 13px;
+    }
-        .ct-card-body .uk-list-large{
-            font-size: 14px;
-        }
+    .ct-card-body .uk-list-large{
+    font-size: 14px;
+    }
-        .ct-card-body .uk-list-large>li{
-            cursor: default;
-            padding-left: 20px;
-            margin-top: 2px !important;
-            padding-top: 17px !important;
-            position: relative;
-        }
+    .ct-card-body .uk-list-large>li{
+    cursor: default;
+    padding-left: 20px;
+    margin-top: 2px !important;
+    padding-top: 17px !important;
+    position: relative;
+    }
-        .ct-card-body .uk-list-large>li:hover{
-            background: #edecec;
-        }
+    .ct-card-body .uk-list-large>li:hover{
+    background: #edecec;
+    }
-        .ct-card-body .uk-list-large>li.active{
-            background: #1e87f0 !important;
-            color: white;
-        }
+    .ct-card-body .uk-list-large>li.active{
+    background: #1e87f0 !important;
+    color: white;
+    }
-        .ct-card-body .uk-list-large>li.active>span.role-code{
-            color: #ffffff;
-        }
+    .ct-card-body .uk-list-large>li.active>span.role-code{
+    color: #ffffff;
+    }
-        .ct-card-body .uk-list-large.role-list>li:hover{
-            background: #fff494;
-        }
+    .ct-card-body .uk-list-large.role-list>li:hover{
+    background: #fff494;
+    }
-        .ct-card-body .uk-list-large>li.active .ct_li_desc{
-            color: #e6e6e6;
-        }
+    .ct-card-body .uk-list-large>li.active .ct_li_desc{
+    color: #e6e6e6;
+    }
-        .ct-card-body .uk-list-large>li>span.uk-badge{
-            position: absolute;
-            top: 17px;
-            right: 25px;
-        }
+    .ct-card-body .uk-list-large>li>span.uk-badge{
+    position: absolute;
+    top: 17px;
+    right: 25px;
+    }
-        .ct-card-body .uk-list-large>li>span.role-code{
-            padding: 4px 6px;
-            color: #a8a8a8;
-            margin-left: 5px;
-        }
+    .ct-card-body .uk-list-large>li>span.role-code{
+    padding: 4px 6px;
+    color: #a8a8a8;
+    margin-left: 5px;
+    }
-        .top_title{
-            padding: 9px 0 5px 15px;
-            border-bottom: 1px solid #ededed;
-            border-left: 5px solid #FFC107;
-        }
+    .top_title{
+    padding: 9px 0 5px 15px;
+    border-bottom: 1px solid #ededed;
+    border-left: 5px solid #FFC107;
+    }
-        .top_title>.desc{
-            font-size: 13px;
-            color: grey;
-            margin-top: 3px;
-        }
+    .top_title>.desc{
+    font-size: 13px;
+    color: grey;
+    margin-top: 3px;
+    }
-        .left_menu_list{
-            overflow: auto;
-            position: relative;
-        }
+    .left_menu_list{
+    overflow: auto;
+    position: relative;
+    }
-        .left_menu_list .ps-container > .ps-scrollbar-x-rail, .ps-container > .ps-scrollbar-y-rail{
-            opacity: 0.6 !important;
-            padding: 0 !important;
-        }
+    .left_menu_list .ps-container > .ps-scrollbar-x-rail, .ps-container > .ps-scrollbar-y-rail{
+    opacity: 0.6 !important;
+    padding: 0 !important;
+    }
-        ._company{
-            margin: 15px 0px;
-        }
-        ._company>h5{
-            margin-bottom: 10px;
-            font-size: 15px;
-            color: #6b6b6b;
-            text-indent: 12px;
-        }
-        ._company>._fgs>label{
-            padding: 3px 12px 3px 10px;
-            display: inline-block;
-            border: 1px solid gainsboro;
-            border-radius: 2px;
-            margin: 5px;
-            font-size: 14px;
-        }
-        ._company>._fgs>label.active{
-            background: #1e87f0;
-            color: #fff;
-        }
-        ._company .uk-checkbox:checked:focus,
-        .line_checkbox_list .uk-checkbox:checked:focus{
-            background-color: #1e87f0 !important;
-        }
-        .save_icon{
-            position: absolute;
-            right: 2px;
-            background: #bec4c9;
-            font-size: 12px;
-            padding: 2px 15px;
-            color: #fff;
-            box-shadow: 0 5px 15px rgba(0,0,0,0.08);
-            cursor: pointer;
-        }
-        .save_icon:hover{
-            background: #FFC107;
-        }
-        .data_auth_list{
-            position: relative;
-        }
-        #user_authorize_wrap .top_title{
-            border-left: 5px solid #cacac8;
-        }
-        .xd_line_list{
-            height: 37%;
-            padding: 7px;
-            border-bottom: 1px solid #f2f2f2;
-            overflow: auto;
-            position: relative;
-        }
-        .xd_line_list>h5{
-            color: #858585;
-            margin: 5px 5px 5px 0;
-            font-size: 14px;
-        }
-        .sub_lines{
-            padding-left: 15px;
-        }
-        .sub_lines>span.line_btn {
-            background: #00BCD4;
-            color: #fff;
-            padding: 4px 9px;
-            display: inline-block;
-            min-width: 68px;
-            text-align: center;
-            margin: 5px 2px;
-            box-shadow: 0 5px 9px rgba(0,0,0,0.08);
-            cursor: pointer;
-            font-size: 14px;
-            font-family: 微软雅黑;
-        }
+    ._company{
+    margin: 15px 0px;
+    }
+    ._company>h5{
+    margin-bottom: 10px;
+    font-size: 15px;
+    color: #6b6b6b;
+    text-indent: 12px;
+    }
+    ._company>._fgs>label{
+    padding: 3px 12px 3px 10px;
+    display: inline-block;
+    border: 1px solid gainsboro;
+    border-radius: 2px;
+    margin: 5px;
+    font-size: 14px;
+    }
+    ._company>._fgs>label.active{
+    background: #1e87f0;
+    color: #fff;
+    }
+    ._company .uk-checkbox:checked:focus,
+    .line_checkbox_list .uk-checkbox:checked:focus{
+    background-color: #1e87f0 !important;
+    }
+    .save_icon{
+    position: absolute;
+    right: 2px;
+    background: #bec4c9;
+    font-size: 12px;
+    padding: 2px 15px;
+    color: #fff;
+    box-shadow: 0 5px 15px rgba(0,0,0,0.08);
+    cursor: pointer;
+    }
+    .save_icon:hover{
+    background: #FFC107;
+    }
+    .data_auth_list{
+    position: relative;
+    }
+    #user_authorize_wrap .top_title{
+    border-left: 5px solid #cacac8;
+    }
+    .xd_line_list{
+    height: 37%;
+    padding: 7px;
+    border-bottom: 1px solid #f2f2f2;
+    overflow: auto;
+    position: relative;
+    }
+    .xd_line_list>h5{
+    color: #858585;
+    margin: 5px 5px 5px 0;
+    font-size: 14px;
+    }
+    .sub_lines{
+    padding-left: 15px;
+    }
+    .sub_lines>span.line_btn {
+    background: #00BCD4;
+    color: #fff;
+    padding: 4px 9px;
+    display: inline-block;
+    min-width: 68px;
+    text-align: center;
+    margin: 5px 2px;
+    box-shadow: 0 5px 9px rgba(0,0,0,0.08);
+    cursor: pointer;
+    font-size: 14px;
+    font-family: 微软雅黑;
+    }
-        .sub_lines>span.line_btn.destroy{
-            background: #ff5c5c;
-        }
+    .sub_lines>span.line_btn.destroy{
+    background: #ff5c5c;
+    }
-        .sub_lines>span.line_btn.destroy:hover{
-            background: #ff7373;
-        }
+    .sub_lines>span.line_btn.destroy:hover{
+    background: #ff7373;
+    }
-        .sub_lines>span.line_btn:hover{
-            background: #2dd7ed;
-        }
-        .add_line_icon{
-            cursor: pointer;
-            padding: 2px 5px;
-            border-radius: 5px;
-            display: inline-block;
-        }
-        .add_line_icon>i{
-            vertical-align: top;
-            margin-top: 3px;
-        }
-        .add_line_icon:hover{
-            background: #ededed;
-        }
-        .ct_pattern_form{
-            display: inline-block;
-        }
-        .xd_menu_grid{
-            padding: 25px 25px 0 25px;
-            height: calc(63% - 91px);
-        }
-        .xd_menu_grid .uk-list{
-            border: 1px solid #ededed;
-            height: calc(100% - 70px);
-            overflow: auto;
-            position: relative;
-        }
+    .sub_lines>span.line_btn:hover{
+    background: #2dd7ed;
+    }
+    .add_line_icon{
+    cursor: pointer;
+    padding: 2px 5px;
+    border-radius: 5px;
+    display: inline-block;
+    }
+    .add_line_icon>i{
+    vertical-align: top;
+    margin-top: 3px;
+    }
+    .add_line_icon:hover{
+    background: #ededed;
+    }
+    .ct_pattern_form{
+    display: inline-block;
+    }
+    .xd_menu_grid{
+    padding: 25px 25px 0 25px;
+    height: calc(63% - 91px);
+    }
+    .xd_menu_grid .uk-list{
+    border: 1px solid #ededed;
+    height: calc(100% - 70px);
+    overflow: auto;
+    position: relative;
+    }
-        .xd_menu_grid .uk-list>li{
-            margin: 5px 0 !important;
-            padding: 10px 0 0 10px !important;
-            font-size: 14px;
-        }
-        .top_tools{
-            position: absolute;
-            top: 15px;
-            right: 25px;
-        }
-        .ct_field {
-            display: inline-block;
-            width: 240px;
-        }
-        .ct_field>select,.ct_field>input{
-            width: calc(100% - 60px);
-        }
-        .line_checkbox_list{
-            margin-top: 15px;
-        }
-        .line_checkbox_list>.btn{
-            padding: 5px 7px;
-            border-radius: 2px;
-            display: inline-block;
-            margin: 4px 9px;
-            font-size: 14px;
-            font-family: 微软雅黑;
-            border: 1px solid #d9d9d9;
-            width: 100px;
-            overflow: hidden;
-            text-overflow: ellipsis;
-            white-space: nowrap;
-        }
-        .line_checkbox_list>.btn>input{
-            margin-right: 5px;
-        }
-        .line_checkbox_list>.btn.active{
-            background: #1e87f0;
-            color: #fff;
-        }
+    .xd_menu_grid .uk-list>li{
+    margin: 5px 0 !important;
+    padding: 10px 0 0 10px !important;
+    font-size: 14px;
+    }
+    .top_tools{
+    position: absolute;
+    top: 15px;
+    right: 25px;
+    }
+    .ct_field {
+    display: inline-block;
+    width: 240px;
+    }
+    .ct_field>select,.ct_field>input{
+    width: calc(100% - 60px);
+    }
+    .line_checkbox_list{
+    margin-top: 15px;
+    }
+    .line_checkbox_list>.btn{
+    padding: 5px 7px;
+    border-radius: 2px;
+    display: inline-block;
+    margin: 4px 9px;
+    font-size: 14px;
+    font-family: 微软雅黑;
+    border: 1px solid #d9d9d9;
+    width: 100px;
+    overflow: hidden;
+    text-overflow: ellipsis;
+    white-space: nowrap;
+    }
+    .line_checkbox_list>.btn>input{
+    margin-right: 5px;
+    }
+    .line_checkbox_list>.btn.active{
+    background: #1e87f0;
+    color: #fff;
+    }
-        .line_checkbox_list>.btn.destroy,
-        .line_checkbox_list>.btn.destroy>input{
-            border-color: #ff9595;
-            color: #ff5c5c;
-        }
+    .line_checkbox_list>.btn.destroy,
+    .line_checkbox_list>.btn.destroy>input{
+    border-color: #ff9595;
+    color: #ff5c5c;
+    }
-        .line_checkbox_list>.btn.destroy.active{
-            background: #ff5c5c;
-            color: #fff;
-        }
+    .line_checkbox_list>.btn.destroy.active{
+    background: #ff5c5c;
+    color: #fff;
+    }
-        .line_checkbox_list>.btn.destroy.active>input{
-            background-color: #ff5c5c !important;
-            border-color: #ff5c5c !important;
-        }
+    .line_checkbox_list>.btn.destroy.active>input{
+    background-color: #ff5c5c !important;
+    border-color: #ff5c5c !important;
+    }
-        #role_authorize_wrap .ztree *{
-            font-size: 14px;
-        }
-        #role_authorize_wrap .ztree li{
-            line-height: 21px;
-        }
-        .loading{
-            height: 100%;
-            text-align: center;
-        }
-        .loading .uk-spinner{
-            margin-top: 200px;
-        }
-        .loading circle{
-            stroke: red;
-        }
+    #role_authorize_wrap .ztree *{
+    font-size: 14px;
+    }
+    #role_authorize_wrap .ztree li{
+    line-height: 21px;
+    }
+    .loading{
+    height: 100%;
+    text-align: center;
+    }
+    .loading .uk-spinner{
+    margin-top: 200px;
+    }
+    .loading circle{
+    stroke: red;
+    }
-        #select_line_modal .uk-checkbox:checked {
-            background-color: #1e87f0;
-        }
+    #select_line_modal .uk-checkbox:checked {
+    background-color: #1e87f0;
+    }
     </style>
+
 </head>
 <body>
@@ -342,6 +355,7 @@
             </div>
         </div>
+
     </div>
 </div>
@@ -359,18 +373,6 @@
     <li class="uk-animation-fade uk-animation-fast" data-name="{{u.name}}" data-code="{{u.userNameUp}}" data-id="{{u.id}}">{{u.name}}<span class="role-code">{{u.userName}}</span></li>
     {{/each}}
 </script>
-<script src="/metronic_v4.5.4/plugins/jquery.min.js"></script>
-<script src="/assets/js/common.js"></script>
-<script src="/assets/plugins/uk3.0/uikit.min.js"></script>
-<script src="/assets/plugins/uk3.0/uikit-icons.min.js"></script>
-<script src="/real_control_v2/assets/plugins/perfect-scrollbar/perfect-scrollbar.jquery.js" ></script>
-<!-- EventProxy  -->
-<script src="/assets/js/eventproxy.js"></script>
-<!-- art-template 模版引擎 -->
-<script src="/assets/plugins/template.js"></script>
-<script src="/real_control_v2/assets/plugins/moment/moment.min.js"></script>
-<script src="/assets/plugins/ztree_v3/js/jquery.ztree.core.min.js"></script>
-<script src="/assets/plugins/ztree_v3/js/jquery.ztree.excheck.min.js"></script>
 <script>
     var storage = window.localStorage;
@@ -464,8 +466,6 @@
     paramsRole['codeName'] = 'ROLE_ADMIN';
     var userId=storage.getItem("editUser");
     $get('/user',{id_eq:userId}, function (rs) {
-        debugger
-        //if (rs)
         ep.emit('query_roles', rs.content[0].roles);
     });
-<iframe src="authorize.html?origin=real_control_iframe" frameborder="0" style="height: 90%;width: 100%;"></iframe>
+<iframe src="/pages/permission/user/authorize.html?origin=real_control_iframe" frameborder="0" style="height: 90%;width: 100%;"></iframe>
 <div class="form-actions">
     <div class="row">
         <div class="col-md-offset-3 col-md-4">
-            <!--<a href="main.html" class="btn green" ><i class="fa fa-check"></i> 上一步</a>-->
-            <!--<button type="submit" class="btn green" ><i class="fa fa-check"></i> 提交</button>-->
-            <!--<a type="button" class="btn default" href="list.html" data-pjax><i class="fa fa-times"></i> 取消</a>-->
         </div>
     </div>
 </div>
 \ No newline at end of file
@@ -566,6 +566,12 @@ dl.relevance-active.intimity dd.tl-qrlb{
     color: #f8e9cd;
 }
+dl.relevance-active dd.tl-wfyd,
+dl.relevance-active.intimity dd.tl-wfyd{
+    background: linear-gradient(to right, rgb( 246,193,10), rgb(226, 226, 168), #8baabf) !important;
+    color: #f8e9cd;
+}
+
 dl.relevance-active dd.tl-wd,
 dl.relevance-active.intimity dd.tl-wd{
     background: linear-gradient(to right, #ffff00, rgb(226, 226, 168), rgb(139, 170, 191)) !important;
@@ -389,21 +389,20 @@
                 rightIdx = rightIdx.substr(0, rightIdx.length - 1);
                 var type = $(this).data('type');
+                reLoadCurrPageData();
                 gb_common.$post('/realSchedule/lpChangeMulti', {leftIdx: leftIdx, rightIdx: rightIdx, type: type}, function (rs) {
                     console.log('rs', rs);
-                    debugger
                     notify_succ("操作成功！！");
                     if(rs.ts)
                         gb_schedule_table.updateSchedule(rs.ts);
-                    reLoadCurrPageData();
+
                 });
             });
             function reLoadCurrPageData(){
-                debugger
                 $('[name=lineSelect]', modal).each(function () {
                     var array = gb_common.get_vals(gb_schedule_table.findScheduleByLine($(this).val())).sort(gb_schedule_table.schedule_sort);
                     //按路牌分组
@@ -39,6 +39,7 @@
                 <span class="tl-xxfc">消息发出</span>
                 <span class="tl-xxsd">消息收到</span>
                 <span class="tl-xxrd">消息阅读</span>
+                <span class="tl-wfyd">无发有到</span>
             </div>
         </div>
     </script>
@@ -186,7 +186,7 @@ var gb_schedule_table = (function () {
     };
     //无发有到时间
     var wfydcolor=function (sch) {
-        if (sch.qdzArrDatesj!=''&&sch.qdzArrDatesj!=null&&sch.fcsjActual==null) {
+        if (sch.fcsjActual==null&&sch.zdsjActual!=null&&sch.zdsjActual!=''&&sch.status!=-1) {//sch.qdzArrDatesj!=''&&sch.qdzArrDatesj!=null&&
             sch.status=4;
         }
     }
@@ -274,7 +274,6 @@ var gb_schedule_table = (function () {
      * @param lineCode
      */
     var reLoadAndRefresh = function (lineCode) {
-        debugger
         $.get('/realSchedule/lines', {
             lines: lineCode + ','
         }, function (rs) {
@@ -387,8 +386,8 @@ var gb_schedule_table = (function () {
         else
             $(dds[8]).html('');
         if (sch.lpChange==1) {
-            var d8html=$(dds[8]).html();
-            $(dds[8]).html(d8html+'<span class="uk-badge uk-badge-success out">换</span>');
+            var d8html=$(dds[5]).html();
+            $(dds[5]).html(d8html+'<span class="uk-badge uk-badge-success out">换</span>');
         }
         //信号状态标记