update

潘钊
1 parent 64ffcea9
Showing 4 changed files with 77 additions and 47 deletions
src/main/java/com/bsth/data/schedule/DayOfSchedule.java
src/main/java/com/bsth/data/schedule/thread/SchedulePstThread.java
src/main/java/com/bsth/entity/realcontrol/ScheduleRealInfo.java
src/main/resources/static/real_control_v2/js/main.js
@@ -797,6 +797,7 @@ public class DayOfSchedule {
     public void save(ScheduleRealInfo sch) {
         //schRepository.save(sch);
+        sch.setUpdateDate(new Date());
         pstBuffer.add(sch);
     }
 package com.bsth.data.schedule.thread;
+import com.alibaba.fastjson.JSON;
 import com.bsth.data.schedule.DayOfSchedule;
 import com.bsth.entity.realcontrol.ScheduleRealInfo;
 import com.bsth.repository.realcontrol.ScheduleRealInfoRepository;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.orm.jpa.JpaObjectRetrievalFailureException;
+import org.springframework.jdbc.core.namedparam.BeanPropertySqlParameterSource;
+import org.springframework.jdbc.core.namedparam.NamedParameterJdbcTemplate;
 import org.springframework.stereotype.Component;
-import javax.persistence.EntityNotFoundException;
-
 /**
  * @author PanZhao
  * @ClassName: SchedulePstThread
@@ -23,36 +23,68 @@ public class SchedulePstThread extends Thread {
     @Autowired
     ScheduleRealInfoRepository scheduleRepository;
+    @Autowired
+    NamedParameterJdbcTemplate jdbcTemplate;
+
+    @Autowired
+    DayOfSchedule dayOfSchedule;
+
     Logger logger = LoggerFactory.getLogger(this.getClass());
     @Override
     public void run() {
-        //LinkedList<ScheduleRealInfo> list = DayOfSchedule.pstBuffer;
-
         ScheduleRealInfo schedule;
         for (int i = 0; i < 1000; i++) {
             schedule = DayOfSchedule.pstBuffer.poll();
             if (null == schedule)
                 break;
-            if(schedule.isDeleted()){
+            if (schedule.isDeleted()) {
                 logger.error("save 发现 deleted=true 的班次，id: " + schedule.getId());
                 continue;
             }
-            try {
-                scheduleRepository.save(schedule);
-            }
-            catch (JpaObjectRetrievalFailureException e1){
-                logger.error("JpaObjectRetrievalFailureException error.... 可忽略");
-            }
-            catch(EntityNotFoundException e2){
-                logger.error("EntityNotFoundException error.... 可忽略");
-            }
-            catch (Exception e) {
-                logger.error("班次入库的时候出现未知异常！！", e);
-            }
+            save(schedule);
+        }
+    }
+
+    /**
+     * 班次更新到数据库，不走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;
+        }
+
+        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);
         }
     }
 }
@@ -30,8 +30,9 @@ public class ScheduleRealInfo {
 	/** 计划ID */
 	private Long spId;
-	/** 排班计划日期 */
+	/** 排班计划日期  --no webSocket */
 	private Date scheduleDate;
+	/** 排班日期字符串 YYYY-MM-DD */
 	private String scheduleDateStr;
 	/** 真实执行时间 yyyy-MM-dd */
@@ -81,9 +82,9 @@ public class ScheduleRealInfo {
 	@Transient
 	private Long zdsjT;
-	/** 发车顺序号 */
+	/** 发车顺序号 --no webSocket*/
 	private Integer fcno;
-	/** 对应班次数 */
+	/** 对应班次数 --no webSocket*/
 	private Integer bcs;
 	/** 计划里程 */
 	private Double jhlc;
@@ -91,10 +92,12 @@ public class ScheduleRealInfo {
 	/** 原始计划里程 （原计调的数据） */
 	private Double jhlcOrig;
-	/** 实际里程  这个字段被废弃*/
+	/** 实际里程  --no webSocket*/
+	@Transient
+	@JsonIgnore
 	private Double realMileage;
-	/** 实际里程 */
+	/** 实际里程 --no webSocket */
 	@Transient
 	private String sjlc;
 	/** 班次历时 */
@@ -153,7 +156,8 @@ public class ScheduleRealInfo {
 	/** 备注*/
 	private String remarks;
-	/** 原计划排班备注 */
+	/** 原计划排班备注 --no webSocket */
+	@Transient
 	private String remark;
 	/**待发时间（格式 HH:mm） */
@@ -166,9 +170,6 @@ public class ScheduleRealInfo {
 	/** 指令下发状态  60: 已发送， 100： 设备确认收到， 200：驾驶员确认   0：失败 */
 	private Integer directiveState = -1;
-	/** “运营状态” 指令下发状态  60: 已发送， 100： 设备确认收到  0：失败*/
-	private Integer opDirectiveState;
-	
 	/** 起点站计划到达时间 */
 	@Transient
 	private String qdzArrDatejh;
@@ -200,7 +201,7 @@ public class ScheduleRealInfo {
 	/** 是否有补发GPS信号 */
 	private boolean reissue;
-	/** 发车屏 发车顺序号，不持久化，会动态变化 */
+	/** 发车屏 发车顺序号，不持久化，会动态变化 --no webSocket*/
 	@Transient
 	private int fcpSn;
@@ -209,6 +210,10 @@ public class ScheduleRealInfo {
 	@JsonIgnore
 	private boolean deleted;
+	@Transient
+	@JsonIgnore
+	private int saveFailCount=0;
+
 	public boolean isDfAuto() {
 		return dfAuto;
 	}
@@ -486,7 +491,7 @@ public class ScheduleRealInfo {
 		if(this.isSflj())
 			this.setJhlcOrig(this.getJhlc());
 	}
-	
+
 	public String getSjlc() {
 		return sjlc;
 	}
@@ -816,22 +821,6 @@ public class ScheduleRealInfo {
 		calcStatus();
 	}
-	public Integer getOpDirectiveState() {
-		return opDirectiveState;
-	}
-
-	public void setOpDirectiveState(Integer opDirectiveState) {
-		this.opDirectiveState = opDirectiveState;
-	}
-
-/*	public ScheduleRealInfo getTwinsSch() {
-		return twinsSch;
-	}
-
-	public void setTwinsSch(ScheduleRealInfo twinsSch) {
-		this.twinsSch = twinsSch;
-	}*/
-
 	public boolean isLate() {
 		return late;
 	}
@@ -925,4 +914,12 @@ public class ScheduleRealInfo {
 	public void setDeleted(boolean deleted) {
 		this.deleted = deleted;
 	}
+
+	public int getSaveFailCount() {
+		return saveFailCount;
+	}
+
+	public void setSaveFailCount(int saveFailCount) {
+		this.saveFailCount = saveFailCount;
+	}
 }
@@ -169,8 +169,8 @@ var disabled_submit_btn = function (form) {
 function showUpdateDescription() {
     //更新说明
     var updateDescription = {
-        date: '2017-07-17',
-        text: '<h5>1、修复了一个蛮蠢的bug，这个bug曾经导致在分班进场班次发出晚20分钟的时候，有一定几率实发时间跳到下午首班营运班次上。</h5>'
+        date: '2017-07-21',
+        text: '<h5>1、修复一个蛮严肃的问题，这个问题有极低的概率导致个别班次的操作不会同步到路单！！！</h5>'
     };
     var storage = window.localStorage