Merge branch 'pudong' of http://222.66.0.204:8090/panzhaov5/bsth_control

into pudong

Merge branch 'pudong' of http://222.66.0.204:8090/panzhaov5/bsth_control
into pudong
廖磊
2 parents e0c80b43 6d79b0c9
Showing 12 changed files with 229 additions and 140 deletions
src/main/java/com/bsth/controller/realcontrol/ScheduleRealInfoController.java
src/main/java/com/bsth/controller/realcontrol/anomalyCheckController.java
src/main/java/com/bsth/data/directive/DayOfDirectives.java
src/main/java/com/bsth/data/directive/DirectivesPstThread.java
src/main/java/com/bsth/data/schedule/DayOfSchedule.java
src/main/java/com/bsth/data/schedule/SchAttrCalculator.java
src/main/java/com/bsth/data/schedule/thread/SchedulePstThread.java
src/main/java/com/bsth/service/calc/impl/CalcWaybillServiceImpl.java
src/main/java/com/bsth/service/realcontrol/impl/ScheduleRealInfoServiceImpl.java
src/main/resources/logback.xml
src/main/resources/static/real_control_v2/fragments/north/nav/history_sch_maintain.html
src/main/resources/static/real_control_v2/js/forms/wrap.html
@@ -23,9 +23,6 @@ import java.util.*;
 @RequestMapping("/realSchedule")
 public class ScheduleRealInfoController extends BaseController<ScheduleRealInfo, Long> {
-	/*@Autowired
-	GetSchedulePlanThread getSchedulePlanThread;*/
-
 	@Autowired
 	ScheduleRealInfoService scheduleRealInfoService;
@@ -110,4 +110,14 @@ public class anomalyCheckController {
         dayOfSchedule.removeExecPlan(nbbm);
         return 1;
     }
+
+    @RequestMapping(value = "/sch_re_calc_id_maps")
+    public int reCalcIdMaps(){
+        return dayOfSchedule.reCalcIdMaps();
+    }
+
+    @RequestMapping(value = "/sch_size_string")
+    public String schSizeString(){
+        return dayOfSchedule.sizeString();
+    }
 }
@@ -15,6 +15,7 @@ import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Component;
 import java.util.*;
+import java.util.concurrent.ConcurrentHashMap;
 /**
  * 
@@ -52,8 +53,8 @@ public class DayOfDirectives {
 	static{
-		d60Map = new HashMap<>();
-		d64Map = new HashMap<>();
+		d60Map = new ConcurrentHashMap<>();
+		d64Map = new ConcurrentHashMap<>();
 		pstDirectives = new LinkedList<>();
 	}
@@ -51,10 +51,6 @@ public class DirectivesPstThread extends Thread {
                             logger.warn("save 指令，发现 deleted=true 的班次，id=" + sch.getId());
                             continue;
                         }
-                        if(dayOfSchedule.get(sch.getId()) == null){
-                            logger.warn("班次：" + sch.getId() + "不存在了，调度指令放弃入库。");
-                            continue;
-                        }
                     }
                     d60Repository.save(d60);
                 }
@@ -14,9 +14,7 @@ import com.bsth.entity.schedule.SchedulePlanInfo;
 import com.bsth.repository.realcontrol.ScheduleRealInfoRepository;
 import com.bsth.service.schedule.SchedulePlanInfoService;
 import com.bsth.websocket.handler.SendUtils;
-import com.google.common.base.Predicate;
 import com.google.common.collect.ArrayListMultimap;
-import com.google.common.collect.Collections2;
 import org.apache.commons.lang3.StringUtils;
 import org.joda.time.format.DateTimeFormat;
 import org.joda.time.format.DateTimeFormatter;
@@ -37,6 +35,7 @@ import java.sql.SQLException;
 import java.text.ParseException;
 import java.text.SimpleDateFormat;
 import java.util.*;
+import java.util.concurrent.ConcurrentHashMap;
 import java.util.concurrent.ConcurrentLinkedQueue;
 /**
@@ -100,11 +99,11 @@ public class DayOfSchedule {
         nbbmScheduleMap = ArrayListMultimap.create();
         lpScheduleMap = ArrayListMultimap.create();
-        id2SchedulMap = new HashMap<>();
+        id2SchedulMap = new ConcurrentHashMap<>();
         pstBuffer = new ConcurrentLinkedQueue<>();
         schFCSJComparator = new ScheduleComparator.FCSJ();
         currSchDateMap = new HashMap<>();
-        carExecutePlanMap = new HashMap<>();
+        carExecutePlanMap = new ConcurrentHashMap<>();
         schedulePlanMap = new HashMap<>();
     }
@@ -266,7 +265,7 @@ public class DayOfSchedule {
     public void clearRAMData(String lineCode) {
         int count = 0;
         List<ScheduleRealInfo> remList = new ArrayList<>();
-        Collection<ScheduleRealInfo> all = id2SchedulMap.values();
+        Collection<ScheduleRealInfo> all = nbbmScheduleMap.values();
         for (ScheduleRealInfo sch : all) {
             if (sch.getXlBm().equals(lineCode))
                 remList.add(sch);
@@ -431,7 +430,7 @@ public class DayOfSchedule {
                     ps.setInt(3, sch.getBcs()==null?0:sch.getBcs());
                     ps.setInt(4, sch.getBcsj()==null?0:sch.getBcsj());
                     ps.setString(5, sch.getClZbh());
-                    ps.setDate(6, new java.sql.Date(sch.getCreateDate().getTime()));
+                    ps.setTimestamp(6, new java.sql.Timestamp(sch.getCreateDate().getTime()));
                     ps.setString(7, sch.getDfsj());
                     ps.setInt(8, sch.getDirectiveState());
                     ps.setInt(9, sch.getFcno()==null?0:sch.getFcno());
@@ -447,12 +446,12 @@ public class DayOfSchedule {
                     ps.setString(19, sch.getRemarks());
                     ps.setString(20, sch.getsGh());
                     ps.setString(21, sch.getsName());
-                    ps.setDate(22, new java.sql.Date(sch.getScheduleDate().getTime()));
+                    ps.setTimestamp(22, new java.sql.Timestamp(sch.getScheduleDate().getTime()));
                     ps.setString(23, sch.getScheduleDateStr());
                     ps.setBoolean(24, sch.isSflj());
                     ps.setLong(25, sch.getSpId());
                     ps.setInt(26, sch.getStatus());
-                    ps.setDate(27, new java.sql.Date(sch.getUpdateDate().getTime()));
+                    ps.setTimestamp(27, new java.sql.Timestamp(sch.getUpdateDate().getTime()));
                     ps.setString(28, sch.getXlBm());
                     ps.setString(29, sch.getXlDir());
                     ps.setString(30, sch.getXlName());
@@ -512,7 +511,7 @@ public class DayOfSchedule {
     public List<ScheduleRealInfo> findByLineCode(String lineCode) {
         List<ScheduleRealInfo> rs = new ArrayList<>();
-        Collection<ScheduleRealInfo> schs = id2SchedulMap.values();
+        Collection<ScheduleRealInfo> schs = nbbmScheduleMap.values();
         for (ScheduleRealInfo sch : schs) {
             if (sch.getXlBm().equals(lineCode))
                 rs.add(sch);
@@ -527,7 +526,7 @@ public class DayOfSchedule {
     public Map<String, Collection<ScheduleRealInfo>> findByLineCodes(List<String> lineList) {
         ArrayListMultimap<String, ScheduleRealInfo> mMap = ArrayListMultimap.create();
-        Collection<ScheduleRealInfo> schs = id2SchedulMap.values();
+        Collection<ScheduleRealInfo> schs = nbbmScheduleMap.values();
         for (ScheduleRealInfo sch : schs) {
             if (lineList.contains(sch.getXlBm())) {
                 mMap.put(sch.getXlBm(), sch);
@@ -584,24 +583,6 @@ public class DayOfSchedule {
         return next(list, sch);
     }
-    /**
-     * 下一个相同走向的班次
-     *
-     * @param sch
-     * @return
-     */
-    public ScheduleRealInfo nextSame(final ScheduleRealInfo sch) {
-        List<ScheduleRealInfo> list = nbbmScheduleMap.get(sch.getClZbh());
-        Collection<ScheduleRealInfo> subList = Collections2.filter(list, new Predicate<ScheduleRealInfo>() {
-
-            @Override
-            public boolean apply(ScheduleRealInfo item) {
-                return item.getXlDir().equals(sch.getXlDir());
-            }
-        });
-        return next(subList, sch);
-    }
-
     /**
      * 下一个班次
@@ -749,8 +730,7 @@ public class DayOfSchedule {
                 .calcRealDate(sch)
                 .calcAllTimeByFcsj(sch);
-        String nbbm = sch.getClZbh();
-        nbbmScheduleMap.put(nbbm, sch);
+        nbbmScheduleMap.put(sch.getClZbh(), sch);
         //主键索引
         id2SchedulMap.put(sch.getId(), sch);
@@ -767,7 +747,6 @@ public class DayOfSchedule {
     }
     public void delete(ScheduleRealInfo sch) {
-        //ScheduleRealInfo sch = id2SchedulMap.get(id);
         if (!sch.isSflj())
             return;
@@ -807,36 +786,6 @@ public class DayOfSchedule {
         return rs;
     }
-    public boolean validTime(ScheduleRealInfo sch, Long ts) {
-        List<ScheduleRealInfo> list = nbbmScheduleMap.get(sch.getClZbh());
-        int ci = list.indexOf(sch);
-        ScheduleRealInfo prve, next;
-        if (ci > 0) {
-            //之前班次实际时间不能大于该时间
-            for (int i = ci - 1; i >= 0; i--) {
-                prve = list.get(i);
-                if (prve.getZdsjActualTime() != null && prve.getZdsjActualTime() > ts)
-                    return false;
-
-                if (prve.getFcsjActualTime() != null && prve.getFcsjActualTime() > ts)
-                    return false;
-            }
-        }
-
-        if (ci < list.size() - 1) {
-            //之后班次实际时间不能小于该时间
-            for (int i = ci + 1; i < list.size(); i++) {
-                next = list.get(i);
-                if (next.getFcsjActualTime() != null && next.getFcsjActualTime() < ts)
-                    return false;
-
-                if (next.getZdsjActualTime() != null && next.getZdsjActualTime() < ts)
-                    return false;
-            }
-        }
-        return true;
-    }
-
     public void save(ScheduleRealInfo sch) {
         sch.setUpdateDate(new Date());
         pstBuffer.add(sch);
@@ -860,26 +809,6 @@ public class DayOfSchedule {
         return sch;
     }
-    /**
-     * @Title: nextByBcType
-     * @Description: TODO(获取下一个指定班次类型的班次)
-     */
-    public ScheduleRealInfo nextByBcType(ScheduleRealInfo sch, String bcType) {
-        List<ScheduleRealInfo> list = nbbmScheduleMap.get(sch.getClZbh());
-        Collections.sort(list, schFCSJComparator);
-
-        boolean flag = false;
-        for (ScheduleRealInfo temp : list) {
-
-            if (flag && temp.getBcType().equals(bcType))
-                return temp;
-
-            if (temp == sch) {
-                flag = true;
-            }
-        }
-        return null;
-    }
     /**
      * 搜索离当前时间最近的一个指定类型的班次
@@ -917,7 +846,7 @@ public class DayOfSchedule {
     }
     public Collection<ScheduleRealInfo> findAll() {
-        return id2SchedulMap.values();
+        return nbbmScheduleMap.values();
     }
     public boolean addExecPlan(ScheduleRealInfo sch) {
@@ -949,6 +878,8 @@ public class DayOfSchedule {
      * @return
      */
     public ScheduleRealInfo executeCurr(String nbbm) {
+        if(StringUtils.isEmpty(nbbm))
+            return null;
         return carExecutePlanMap.get(nbbm);
     }
@@ -984,12 +915,12 @@ public class DayOfSchedule {
     }
     public void reCalcExecPlan(String nbbm) {
-        //logger.info("reCalcExecPlan...: " + nbbm);
         List<ScheduleRealInfo> list = nbbmScheduleMap.get(nbbm);
         Collections.sort(list, schFCSJComparator);
         ScheduleRealInfo sch = schAttrCalculator.calcCurrentExecSch(list);
-        carExecutePlanMap.put(nbbm, sch);
+        if(null != sch)
+            carExecutePlanMap.put(nbbm, sch);
     }
     /**
@@ -1130,4 +1061,24 @@ public class DayOfSchedule {
         }
         return count;
     }
+
+    /**
+     * 重新计算ID对照map
+     */
+    public int reCalcIdMaps(){
+        Collection<ScheduleRealInfo> all = findAll();
+        Map<Long, ScheduleRealInfo> id2SchedulMapCopy = new ConcurrentHashMap<>();
+
+        for(ScheduleRealInfo sch : all){
+            id2SchedulMapCopy.put(sch.getId(), sch);
+        }
+
+        id2SchedulMap = id2SchedulMapCopy;
+
+        return id2SchedulMap.size();
+    }
+
+    public String sizeString(){
+        return id2SchedulMap.size() + "/" + nbbmScheduleMap.size();
+    }
 }
 \ No newline at end of file
@@ -206,6 +206,8 @@ public class SchAttrCalculator {
      * @return
      */
     public ScheduleRealInfo calcCurrentExecSch(List<ScheduleRealInfo> list) {
+        if(list.size()==0)
+            return null;
         String lineCode = list.get(0).getXlBm();
         LineConfig conf = lineConfigData.get(lineCode);
@@ -7,9 +7,18 @@ import com.bsth.repository.realcontrol.ScheduleRealInfoRepository;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.jdbc.core.namedparam.BeanPropertySqlParameterSource;
-import org.springframework.jdbc.core.namedparam.NamedParameterJdbcTemplate;
+import org.springframework.jdbc.core.BatchPreparedStatementSetter;
+import org.springframework.jdbc.core.JdbcTemplate;
+import org.springframework.jdbc.datasource.DataSourceTransactionManager;
 import org.springframework.stereotype.Component;
+import org.springframework.transaction.TransactionDefinition;
+import org.springframework.transaction.TransactionStatus;
+import org.springframework.transaction.support.DefaultTransactionDefinition;
+
+import java.sql.PreparedStatement;
+import java.sql.SQLException;
+import java.util.ArrayList;
+import java.util.List;
 /**
  * @author PanZhao
@@ -24,18 +33,20 @@ public class SchedulePstThread extends Thread {
     ScheduleRealInfoRepository scheduleRepository;
     @Autowired
-    NamedParameterJdbcTemplate jdbcTemplate;
+    JdbcTemplate jdbcTemplate;
     @Autowired
     DayOfSchedule dayOfSchedule;
     Logger logger = LoggerFactory.getLogger(this.getClass());
+    static List<ScheduleRealInfo> saveList = new ArrayList<>();
+
     @Override
     public void run() {
         ScheduleRealInfo schedule;
-        for (int i = 0; i < 1000; i++) {
+        for (int i = 0; i < 500; i++) {
             schedule = DayOfSchedule.pstBuffer.poll();
             if (null == schedule)
                 break;
@@ -45,46 +56,106 @@ public class SchedulePstThread extends Thread {
                 continue;
             }
-            save(schedule);
+            saveList.add(schedule);
         }
+
+        //写入数据库
+        save();
     }
-    /**
-     * 班次更新到数据库，不走jpa
-     *
-     * @param sch
-     */
-    public void save(ScheduleRealInfo sch) {
-        if (sch.getId() == null) {
-            logger.error("入库的班次没有ID, " + JSON.toJSONString(sch));
-            return;
-        }
-        if(sch.getSaveFailCount() > 5){
-            logger.error("入库失败上限, " + JSON.toJSONString(sch));
-            return;
-        }
+    private void save(){
+        //记录同步数据
+        logger.info("real schedule update size: " + saveList.size());
+        logger.info(JSON.toJSONString(saveList));
+
+        //批量入库
+        update2Db();
+
+        //清空容器
+        saveList.clear();
+    }
+
+    private void update2Db(){
+        final List<ScheduleRealInfo> pstList = saveList;
+        //编程式事务
+        DataSourceTransactionManager tran = new DataSourceTransactionManager(jdbcTemplate.getDataSource());
+        DefaultTransactionDefinition def = new DefaultTransactionDefinition();
+        def.setPropagationBehavior(TransactionDefinition.PROPAGATION_REQUIRED);
+        TransactionStatus status = tran.getTransaction(def);
+
+        try{
+            //更新
+            jdbcTemplate.batchUpdate("update bsth_c_s_sp_info_real set bc_type=?,bcs=?,bcsj=?,cl_zbh=?,create_date=?" +
+                    ",dfsj=?,directive_state=?,fcno=?,fcsj=?,fcsj_actual=?,j_gh=?,j_name=?,jhlc=?,lp_name=?,qdz_code=?" +
+                    ",qdz_name=?,real_exec_date=?,remarks=?,s_gh=?,s_name=?,schedule_date=?,schedule_date_str=?,sflj=?" +
+                    ",sp_id=?,status=?,update_date=?,xl_bm=?,xl_dir=?,xl_name=?,zdsj=?,zdsj_actual=?,zdz_code=?,zdz_name=?" +
+                    ",ccno=?,df_auto=?,fgs_bm=?,fgs_name=?,gs_bm=?,gs_name=?,online=?,adjust_exps=?,reissue=?,jhlc_orig=?" +
+                    ",sigin_compate=?,drift_status=?,cc_service=?,major_station_name=? where id=?", new BatchPreparedStatementSetter() {
+                @Override
+                public void setValues(PreparedStatement ps, int i) throws SQLException {
+                    ScheduleRealInfo sch = pstList.get(i);
+                    ps.setString(1, sch.getBcType());
+                    ps.setInt(2, sch.getBcs()==null?0:sch.getBcs());
+                    ps.setInt(3, sch.getBcsj()==null?0:sch.getBcsj());
+                    ps.setString(4, sch.getClZbh());
+                    ps.setTimestamp(5, new java.sql.Timestamp(sch.getCreateDate().getTime()));
+                    ps.setString(6, sch.getDfsj());
+                    ps.setInt(7, sch.getDirectiveState());
+                    ps.setInt(8, sch.getFcno()==null?0:sch.getFcno());
+                    ps.setString(9, sch.getFcsj());
+                    ps.setString(10, sch.getFcsjActual());
+                    ps.setString(11, sch.getjGh());
+                    ps.setString(12, sch.getjName());
+                    ps.setDouble(13, sch.getJhlc());
+                    ps.setString(14, sch.getLpName());
+                    ps.setString(15, sch.getQdzCode());
+                    ps.setString(16, sch.getQdzName());
+                    ps.setString(17, sch.getRealExecDate());
+                    ps.setString(18, sch.getRemarks());
+                    ps.setString(19, sch.getsGh());
+                    ps.setString(20, sch.getsName());
+                    ps.setTimestamp(21, new java.sql.Timestamp(sch.getScheduleDate().getTime()));
+                    ps.setString(22, sch.getScheduleDateStr());
+                    ps.setBoolean(23, sch.isSflj());
+                    ps.setLong(24, sch.getSpId());
+                    ps.setInt(25, sch.getStatus());
+                    ps.setTimestamp(26, new java.sql.Timestamp(sch.getUpdateDate().getTime()));
+                    ps.setString(27, sch.getXlBm());
+                    ps.setString(28, sch.getXlDir());
+                    ps.setString(29, sch.getXlName());
+                    ps.setString(30, sch.getZdsj());
+                    ps.setString(31, sch.getZdsjActual());
+                    ps.setString(32, sch.getZdzCode());
+                    ps.setString(33, sch.getZdzName());
+                    ps.setInt(34, sch.getCcno()==null?0:sch.getCcno());
+                    ps.setBoolean(35, sch.isDfAuto());
+                    ps.setString(36, sch.getFgsBm());
+                    ps.setString(37, sch.getFgsName());
+                    ps.setString(38, sch.getGsBm());
+                    ps.setString(39, sch.getGsName());
+                    ps.setBoolean(40, sch.isOnline());
+                    ps.setString(41, sch.getAdjustExps());
+                    ps.setBoolean(42, sch.isReissue());
+                    ps.setDouble(43, sch.getJhlcOrig());
+                    ps.setInt(44, sch.getSiginCompate());
+                    ps.setInt(45, sch.getDriftStatus());
+                    ps.setBoolean(46, sch.isCcService());
+                    ps.setString(47, sch.getMajorStationName());
+
+                    ps.setLong(48, sch.getId());
+                }
+
+                @Override
+                public int getBatchSize() {
+                    return pstList.size();
+                }
+            });
-        try {
-            String sql = "UPDATE bsth_c_s_sp_info_real" +
-                    " SET adjust_exps=:adjustExps, bc_type=:bcType, bcs=:bcs, bcsj=:bcsj, ccno=:ccno, cl_zbh=:clZbh, df_auto=:dfAuto," +
-                    " dfsj=:dfsj, directive_state=:directiveState, fcno=:fcno, fcsj=:fcsj, fcsj_actual=:fcsjActual, fgs_bm=:fgsBm, fgs_name=:fgsName, gs_bm=:gsBm, gs_name=:gsName," +
-                    " j_gh=:jGh, j_name=:jName, jhlc=:jhlc, jhlc_orig=:jhlcOrig, lp_name=:lpName, ONLINE=:online, qdz_code=:qdzCode, qdz_name=:qdzName," +
-                    " real_exec_date=:realExecDate, reissue=:reissue, remarks=:remarks, s_gh=:sGh, s_name=:sName, schedule_date=:scheduleDate," +
-                    " schedule_date_str=:scheduleDateStr, sflj=:sflj, sp_id=:spId, STATUS=:status, update_date=:updateDate, xl_bm=:xlBm, xl_dir=:xlDir, xl_name=:xlName," +
-                    " zdsj=:zdsj, zdsj_actual=:zdsjActual, zdz_code=:zdzCode, zdz_name=:zdzName" +
-                    " WHERE " +
-                    " id=:id";
-
-            jdbcTemplate.update(sql, new BeanPropertySqlParameterSource(sch));
-            sch.setSaveFailCount(0);
-        } catch (Exception e) {
-            //下次入库再试
-            sch.setSaveFailCount(sch.getSaveFailCount()+1);
-            dayOfSchedule.save(sch);
-
-            logger.error("班次 " + sch.getId() + "入库失败，" + JSON.toJSONString(sch));
-            logger.error("", e);
+            tran.commit(status);
+        }catch (Exception e){
+            tran.rollback(status);
+            logger.error("同步数据库失败，" , e);
         }
     }
 }
@@ -69,7 +69,7 @@ public class CalcWaybillServiceImpl extends BaseServiceImpl&lt;CalcWaybill, Integer
 				return newMap;
 			}
-			String sql = "select c.id,c.out_config,c.start_opt,c.trust,t.line_code from bsth_c_line_config c LEFT JOIN bsth_c_line t on c.line=t.id";
+			String sql = "select c.id,c.out_config,c.start_opt,t.line_code from bsth_c_line_config c LEFT JOIN bsth_c_line t on c.line=t.id";
 			if(line.length() != 0){
 				sql += " where t.line_code = " + line;
 			}
@@ -82,7 +82,6 @@ public class CalcWaybillServiceImpl extends BaseServiceImpl&lt;CalcWaybill, Integer
 						m.put("id", rs.getLong("id"));
 						m.put("out_config", rs.getString("out_config"));
 						m.put("start_opt", rs.getString("start_opt"));
-						m.put("trust", rs.getString("trust"));
 						m.put("line_code", rs.getString("line_code"));
 						return m;
 					}});
@@ -77,7 +77,7 @@ import org.springframework.jdbc.core.JdbcTemplate;
 import org.springframework.jdbc.core.RowMapper;
 import org.springframework.stereotype.Service;
-import java.io.*;
+import java.io.File;
 import java.sql.ResultSet;
 import java.sql.SQLException;
 import java.text.DecimalFormat;
@@ -85,8 +85,6 @@ import java.text.ParseException;
 import java.text.SimpleDateFormat;
 import java.util.*;
 import java.util.regex.Pattern;
-import java.util.zip.ZipEntry;
-import java.util.zip.ZipOutputStream;
 @Service
 public class ScheduleRealInfoServiceImpl extends BaseServiceImpl<ScheduleRealInfo, Long>
@@ -3346,6 +3344,8 @@ public class ScheduleRealInfoServiceImpl extends BaseServiceImpl&lt;ScheduleRealInf
                 if("major".equals(bcType)){
                     sch.setMajorStationName(majorStationName);
                 }
+
+                dayOfSchedule.save(sch);
             }
         } catch (Exception e) {
             logger.error("", e);
@@ -250,6 +250,29 @@
 	<!--<appender-ref ref="STDOUT" />-->
 	<!--</logger>-->
+	<!-- 实际排班数据库更新日志 -->
+	<!-- 消息队列纪录 -->
+	<appender name="REAL_SCHEDULE_UPDATE"
+			  class="ch.qos.logback.core.rolling.RollingFileAppender">
+		<file>${LOG_BASE}/real_sch_db/update.log</file>
+		<rollingPolicy class="ch.qos.logback.core.rolling.TimeBasedRollingPolicy">
+			<fileNamePattern>${LOG_BASE}/real_sch_db/update-%d{yyyy-MM-dd}.%i.log</fileNamePattern>
+			<timeBasedFileNamingAndTriggeringPolicy
+					class="ch.qos.logback.core.rolling.SizeAndTimeBasedFNATP">
+				<maxFileSize>100MB</maxFileSize>
+			</timeBasedFileNamingAndTriggeringPolicy>
+		</rollingPolicy>
+
+		<layout class="ch.qos.logback.classic.PatternLayout">
+			<pattern>%d{MM-dd HH:mm:ss.SSS} %-5level -%msg%n
+			</pattern>
+		</layout>
+	</appender>
+	<logger name="com.bsth.data.schedule.thread.SchedulePstThread"
+			level="INFO" additivity="false">
+		<appender-ref ref="REAL_SCHEDULE_UPDATE" />
+	</logger>
+
 	<!--JdbcTemplate的日志输出器 -->
 	<logger name="org.springframework.jdbc.core.StatementCreatorUtils"
 			additivity="false" level="INFO">
@@ -37,6 +37,8 @@
                     </div>
                     <button class="uk-button">检索</button>
                     <a class="add_lp_link" ><i class="uk-icon-plus"></i> 临加路牌</a>
+                    <button id="reCountBtn" class="uk-button uk-button-danger uk-button-mini" style="position: absolute;right: 12px;bottom: 14px;">
+                        重新统计</button>
                 </fieldset>
             </form>
         </div>
@@ -414,6 +416,39 @@
                 return true;
             }
+
+            /**
+             * 重新统计
+             */
+            $('#reCountBtn', modal).on('click', function () {
+                $(this).attr('disabled', 'disabled');
+                $(this).prepend('<i class="uk-icon-spinner uk-icon-spin"></i>');
+
+                var rq = $('.h-s-time li.uk-active', modal).text(),
+                        lineName = $('.h-s-line li.uk-active', modal).text(),
+                        lineCode = $('.h-s-line li.uk-active', modal).data('id');
+
+                var that = this;
+                alt_confirm('确定要重新统计 ' + lineName + '（'+rq+'）的数据吗？',function () {
+
+                    var reCountEp = EventProxy.create('calcWaybill', 'ylbUpdate', function () {
+                        $('i.uk-icon-spin', that).remove();
+                        $(this).removeAttr('disabled');
+                        notify_succ('重新统计成功！');
+                    });
+
+                    //统计路单 -娄高峰
+                    gb_common.$get('/calcWaybill/generateNew', {date:rq, line: lineCode}, function () {
+                        reCountEp.emitLater('calcWaybill');
+                    });
+
+                    //统计油 -廖磊
+                    gb_common.$post('/ylb/updateHistory', {date:rq, line: lineCode}, function () {
+                        reCountEp.emitLater('ylbUpdate');
+                    });
+
+                }, '我确定');
+            });
         })();
     </script>
 </div>
 \ No newline at end of file
@@ -100,9 +100,13 @@
                     //ed=d.format(f),
                     //sd=d.subtract(3, 'days').format(f);
-            $('#date', '.form-page-content').data('DateTimePicker')
-                    .defaultDate(d.format(f));
-                    //.maxDate(ed).minDate(sd);
+            try{
+                $('#date', '.form-page-content').data('DateTimePicker')
+                        .defaultDate(d.format(f));
+                        //.maxDate(ed).minDate(sd);
+            }catch (e){
+                console.log(e);
+            }
             if($("#ddrbBody").length > 0){
                 $("#ddrbBody").height("620px");