update...

潘钊
1 parent 2d30c614
Showing 7 changed files with 49 additions and 4 deletions
src/main/java/com/bsth/data/directive/DirectiveCreator.java
src/main/java/com/bsth/data/directive/DirectivesPstThread.java
src/main/java/com/bsth/data/schedule/thread/SchedulePstThread.java
src/main/java/com/bsth/entity/directive/D60.java
src/main/java/com/bsth/entity/realcontrol/ScheduleRealInfo.java
src/main/java/com/bsth/service/directive/DirectiveServiceImpl.java
src/main/java/com/bsth/service/realcontrol/impl/ScheduleRealInfoServiceImpl.java
@@ -42,7 +42,7 @@ public class DirectiveCreator {
 	 * @return Directive60    返回类型 
 	 * @throws
 	 */
-	public D60 createD60(String nbbm, String text, Short dispatchInstruct, int upDown, int state) {
+	public D60 createD60(String nbbm, String text, Short dispatchInstruct, int upDown, int state,String lineCode) {
 		Long timestamp = System.currentTimeMillis();
 		Short company = Short.parseShort(BasicData.nbbm2CompanyCodeMap.get(nbbm));
@@ -66,6 +66,7 @@ public class DirectiveCreator {
 		data.setCompanyCode(company);
 		data.setMsgId(msgId);
 		directive.setData(data);
+		directive.setLineCode(lineCode);
 		long serviceState;
 		try {
 			serviceState = Consts.SERVICE_STATE[upDown][state];
@@ -47,6 +47,10 @@ public class DirectivesPstThread extends Thread {
                     if(d60.isDispatch()){
                         ScheduleRealInfo sch = d60.getSch();
                         //如果关联的班次已经不存在了，放弃入库
+                        if(sch.isDeleted()){
+                            logger.warn("save 指令，发现 deleted=true 的班次，id=" + sch.getId());
+                            continue;
+                        }
                         if(dayOfSchedule.get(sch.getId()) == null){
                             logger.warn("班次：" + sch.getId() + "不存在了，调度指令放弃入库。");
                             continue;
@@ -36,6 +36,11 @@ public class SchedulePstThread extends Thread {
             if (null == schedule)
                 break;
+            if(schedule.isDeleted()){
+                logger.error("save 发现 deleted=true 的班次，id: " + schedule.getId());
+                continue;
+            }
+
             try {
                 scheduleRepository.save(schedule);
             }
@@ -62,6 +62,11 @@ public class D60 extends Directive {
     private boolean isDispatch;
     /**
+     * 线路编码
+     */
+    private String lineCode;
+
+    /**
      * 相关联的班次
      */
     @JsonIgnore
@@ -84,6 +89,14 @@ public class D60 extends Directive {
         this.reply47Time = reply47Time;
     }
+    public String getLineCode() {
+        return lineCode;
+    }
+
+    public void setLineCode(String lineCode) {
+        this.lineCode = lineCode;
+    }
+
     @Embeddable
     public static class D60Data {
         // 公司代码
@@ -204,6 +204,11 @@ public class ScheduleRealInfo {
 	@Transient
 	private int fcpSn;
+	/** 标记班次已被删除 */
+	@Transient
+	@JsonIgnore
+	private boolean deleted;
+
 	public boolean isDfAuto() {
 		return dfAuto;
 	}
@@ -912,4 +917,12 @@ public class ScheduleRealInfo {
 	public boolean _isInout(){
 		return this.getBcType().equals("out") || this.getBcType().equals("in");
 	}
+
+	public boolean isDeleted() {
+		return deleted;
+	}
+
+	public void setDeleted(boolean deleted) {
+		this.deleted = deleted;
+	}
 }
@@ -119,6 +119,8 @@ public class DirectiveServiceImpl extends BaseServiceImpl&lt;D60, Integer&gt; implemen
             d60 = new DirectiveCreator().createD60_01(sch.getClZbh(), text, Integer.parseInt(sch.getXlDir())
                     , 0, new Date(alarmTime));
+
+            d60.setLineCode(sch.getXlBm());
         } catch (Exception e) {
             logger.error("生成调度指令时出现异常", e);
             return -1;
@@ -190,7 +192,7 @@ public class DirectiveServiceImpl extends BaseServiceImpl&lt;D60, Integer&gt; implemen
         logger.info("切换运营状态, nbbm: " + nbbm + " ,state: " + state + " ,upDown:" + upDown);
         String text = "切换为 " + (upDown == 0 ? "上行" : "下行") + (state == 0 ? "营运" : "未营运");
-        D60 d60 = new DirectiveCreator().createD60(nbbm, text, (short) 0x03, upDown, state);
+        D60 d60 = new DirectiveCreator().createD60(nbbm, text, (short) 0x03, upDown, state, null);
         if (null == d60)
             return -1;
@@ -257,6 +259,7 @@ public class DirectiveServiceImpl extends BaseServiceImpl&lt;D60, Integer&gt; implemen
     public D60 create60Data(String nbbm, String text, Short dispatchInstruct, ScheduleRealInfo sch) {
         String deviceId = BasicData.deviceId2NbbmMap.inverse().get(nbbm);
+        String lineCode = null;
         if (null == deviceId) {
             logger.error("没有设备号对照的车辆：" + nbbm);
             return null;
@@ -281,13 +284,14 @@ public class DirectiveServiceImpl extends BaseServiceImpl&lt;D60, Integer&gt; implemen
             } else {
                 upDown = gpsData.getUpDown();
                 state = gpsData.getState();
+                lineCode = gpsData.getLineId();
             }
         } else {
             upDown = Byte.parseByte(sch.getXlDir());
             state = 0;
         }
-        return new DirectiveCreator().createD60(nbbm, text, dispatchInstruct, upDown, state);
+        return new DirectiveCreator().createD60(nbbm, text, dispatchInstruct, upDown, state, lineCode);
     }
     @Override
@@ -643,8 +643,9 @@ public class ScheduleRealInfoServiceImpl extends BaseServiceImpl&lt;ScheduleRealInf
         Map<String, Object> rs = new HashMap<>();
         rs.put("status", ResponseCode.ERROR);
+        ScheduleRealInfo sch = null;
         try {
-            ScheduleRealInfo sch = dayOfSchedule.get(id);
+            sch = dayOfSchedule.get(id);
             if (sch == null) {
                 rs.put("msg", "无效的id号");
                 return rs;
@@ -655,6 +656,7 @@ public class ScheduleRealInfoServiceImpl extends BaseServiceImpl&lt;ScheduleRealInf
                 return rs;
             }
+            sch.setDeleted(true);
             //解除和调度指令的外键约束
             jdbcTemplate.update(Constants.REMOVE_DIRECTIVE_SCH_FK, id);
@@ -674,9 +676,12 @@ public class ScheduleRealInfoServiceImpl extends BaseServiceImpl&lt;ScheduleRealInf
                 rs.put("ts", ts);
                 rs.put("delete", sch);
             }
+            else
+                sch.setDeleted(false);
         }catch (Exception e){
             logger.error("", e);
             rs.put("msg", e.getMessage());
+            sch.setDeleted(false);
         }
         return rs;