update...

潘钊
1 parent a4a93d14
Showing 1 changed file with 2 additions and 4 deletions
src/main/java/com/bsth/service/directive/DirectiveServiceImpl.java
@@ -114,10 +114,8 @@ public class DirectiveServiceImpl extends BaseServiceImpl&lt;D60, Integer&gt; implemen
                     + sch.getQdzName() + "发往" + sch.getZdzName();
  
             //下发0x01指令  调度指令(闹钟有效)
-            long t = System.currentTimeMillis(), alarmTime;
-            alarmTime = sch.getDfsjT();
-            if (sch.getDfsjT() < t)
-                alarmTime = t + 1000 * 30;
+            long t = System.currentTimeMillis() + 1000 * 30,
+                    alarmTime = sch.getDfsjT() < t?t:sch.getDfsjT();
  
             d60 = new DirectiveCreator().createD60_01(sch.getClZbh(), text, Integer.parseInt(sch.getXlDir())
                     , 0, new Date(alarmTime));