[update] 事件相位空放入库

wj-datacenter-service/src/main/java/net/wanji/datacenter/common/PhaseEmptyEnum.java

@@ -10,52 +10,56 @@ import lombok.Getter;
 @Getter
 @AllArgsConstructor
 public enum PhaseEmptyEnum {
-    EXT_NS(-100, "1,5", "2"),
-    EXT_EW(-101, "3,7", "2"),
-    EXT_NS_L(-102, "1,5", "1"),
-    EXT_EW_L(-103, "3,7", "1"),
-    EXT_N2S(-110, "5", "2"),
-    EXT_E2W(-112, "7", "2"),
-    EXT_S2N(-114, "1", "2"),
-    EXT_W2E(-116, "3", "2"),
-    EXT_N2S_L(-120, "5", "1"),
-    EXT_E2W_L(-122, "7", "1"),
-    EXT_S2N_L(-124, "1", "1"),
-    EXT_W2E_L(-126, "3", "1"),
-    //EXT_CUR(-150, "3", "1"),
-    AAAA(0,"", "");
+    EXT_NS(-100, "1,5", "2", "延长南北方向直行的绿灯"),
+    EXT_EW(-101, "3,7", "2", "延长东西方向直行的绿灯"),
+    EXT_NS_L(-102, "1,5", "1", " 延长南北方向左转的绿灯"),
+    EXT_EW_L(-103, "3,7", "1", "延长东西方向左转的绿灯"),
+    EXT_N2S(-110, "5", "2", "延长北向南直行的绿灯"),
+    EXT_E2W(-112, "7", "2", "延长东向西直行的绿灯"),
+    EXT_S2N(-114, "1", "2", "延长南向北直行的绿灯"),
+    EXT_W2E(-116, "3", "2", "延长西向东直行的绿灯"),
+    EXT_N2S_L(-120, "5", "1", "延长北向南左转的绿灯"),
+    EXT_E2W_L(-122, "7", "1", "延长东向西左转的绿灯"),
+    EXT_S2N_L(-124, "1", "1", "延长南向北左转的绿灯"),
+    EXT_W2E_L(-126, "3", "1", "延长西向东左转的绿灯"),
+    // 延长当前方向的绿灯
+    EXT_CUR(-150, "0", "0", "延长当前方向的绿灯"),
+    SKIP_NS(-200, "1,5", "2", "南北方向直行绿灯步进到下一个相位"),
+    SKIP_EW(-201, "3,7", "2", "东西方向直行绿灯步进到下一个相位"),
+    SKIP_NS_L(-202, "1,5", "1", "南北方向左转绿灯步进到下一个相位"),
+    SKIP_EW_L(-203, "3,7", "1", "东西方向左转绿灯步进到下一个相位"),
+    SKIP_N2S(-210, "5", "1", "北向南直行绿灯步进到下一个相位"),
+    SKIP_E2W(-212, "7", "1", "东向西直行绿灯步进到下一个相位"),
+    SKIP_S2N(-214, "1", "1", "南向北直行绿灯步进到下一个相位"),
+    SKIP_W2E(-216, "3", "1", "西向东直行绿灯步进到下一个相位"),
+    SKIP_N2S_L(-220, "5", "2", "北向南左转绿灯步进到下一个相位"),
+    SKIP_E2W_L(-222, "7", "2", "东向西左转绿灯步进到下一个相位"),
+    SKIP_S2N_L(-224, "1", "2", "南向北左转绿灯步进到下一个相位"),
+    SKIP_W2E_L(-226, "3", "2", "西向东左转绿灯步进到下一个相位"),
+    // 当前绿灯步进到下一个相位
+    SKIP_CUR(-250, "3", "2", "当前绿灯步进到下一个相位"),
+    NORMAL(0, "0", "0", "程序正常运行，不对信号机做调整"),
+    // 获取灯态信息失败
+    NO_LIGHT_STATUS(10, "0", "0", "获取灯态信息失败"),
+    // 当前时刻，路口没有绿灯可通行的方向，所以不对信号机做调整
+    NORMAL_NO_GREEN(11, "0", "0", "当前时刻，路口没有绿灯可通行的方向，所以不对信号机做调整"),
+    PHASE_ERR(12, "0", "0", "获取或解析配时方案失败"),
+    CODE_ERR(30, "0", "0", "代码出现异常"),
+    // 测到灯态异常后，自动解锁成功
+    ABNORMAL_UNLOCK_SUCC(40, "0", "0", "检测到灯态异常后，自动解锁成功"),
+    ABNORMAL_UNLOCK_FAIL(41, "0", "0", "检测到灯态异常后，自动解锁失败"),
+    // 在即将给信号机下发延长指令前检测到代码运行时间太长
+    TAKE_LONG_BEFORE_EXT(60, "0", "0", "在即将给信号机下发延长指令前检测到代码运行时间太长"),
+    // 在即将给信号机下发步进指令前检测到代码运行时间太长
+    TAKE_LONG_BEFORE_SKIP(61, "0", "0", "在即将给信号机下发步进指令前检测到代码运行时间太长"),
+    MIN_GREEN(70, "0", "0", "最小绿"),
+    ABNORMAL_COUNTDOWN(9999, "0", "0", "从灯态中获取到的绿灯倒计时异常（一般是由于信号机现在受临时方案控制，比如）");
 
     private final Integer code;
     /** 车流向 */
     private final String dir;
     private final String turn;
-    //        EXT_CUR = -150 # 延长当前方向的绿灯
-    //        SKIP_NS = -200 # 南北方向直行绿灯步进到下一个相位
-    //        SKIP_EW = -201 # 东西方向直行绿灯步进到下一个相位
-    //        SKIP_NS_L = -202 # 南北方向左转绿灯步进到下一个相位
-    //        SKIP_EW_L = -203 # 东西方向左转绿灯步进到下一个相位
-    //        SKIP_N2S = -210 # 北向南直行绿灯步进到下一个相位
-    //        SKIP_E2W = -212 # 东向西直行绿灯步进到下一个相位
-    //        SKIP_S2N = -214 # 南向北直行绿灯步进到下一个相位
-    //        SKIP_W2E = -216 # 西向东直行绿灯步进到下一个相位
-    //        SKIP_N2S_L = -220 # 北向南左转绿灯步进到下一个相位
-    //        SKIP_E2W_L = -222 # 东向西左转绿灯步进到下一个相位
-    //        SKIP_S2N_L = -224 # 南向北左转绿灯步进到下一个相位
-    //        SKIP_W2E_L = -226 # 西向东左转绿灯步进到下一个相位
-    //        SKIP_CUR = -250 # 当前绿灯步进到下一个相位
-    //        NORMAL = 0 # 程序正常运行，不对信号机做调整
-    //        VID_DELAY = 1 # 视频延迟
-    //        VID_INVALID = 2 # 视频解析的结果中部分值缺失（比如没有行人的检测结果）
-    //NO_LIGHT_STATUS = 10 # 获取灯态信息失败
-    //        NORMAL_NO_GREEN = 11 # 当前时刻，路口没有绿灯可通行的方向，所以不对信号机做调整
-    //        PHASE_ERR = 12 # 获取或解析配时方案失败
-    //        VID_LIGHT_NOT_MATCH = 20 # 视频检测的红绿灯灯态与从交通大脑获取的信号机灯态不一致
-    //        CODE_ERR = 30 # 代码出现异常
-    //        ABNORMAL_UNLOCK_SUCC = 40 # 检测到灯态异常后，自动解锁成功
-    //        ABNORMAL_UNLOCK_FAIL = 41 # 检测到灯态异常后，自动解锁失败
-    //        TAKE_LONG_BEFORE_EXT = 60 # 在即将给信号机下发延长指令前检测到代码运行时间太长
-    //        TAKE_LONG_BEFORE_SKIP = 61 # 在即将给信号机下发步进指令前检测到代码运行时间太长
-    //        MIN_GREEN = 70 # 最小绿
-    //        ABNORMAL_COUNTDOWN = 9999 # 从灯态中获取到的绿灯倒计时异常（一般是由于信号机现在受临时方案控制，比如）
+    private final String desc;
+
 
 }

wj-datacenter-service/src/main/java/net/wanji/datacenter/kafka/CrossStrategyOptConsumerHandler.java

@@ -36,7 +36,7 @@ public class CrossStrategyOptConsumerHandler implements KafkaListenerErrorHandle
      * @param acknowledgment
      * @throws Exception
      */
-    //@KafkaListener(topics = {"${kafka-consumer.phaseEmptyTopic}"}, groupId = "group")
+    @KafkaListener(topics = {"${kafka-consumer.phaseEmptyTopic}"}, groupId = "group")
     public void receivePhaseEmptyData(ConsumerRecord<Object, Object> record, Acknowledgment acknowledgment) throws Exception {
         try {
             String message = String.valueOf(record.value());

wj-datacenter-service/src/main/java/net/wanji/datacenter/pojo/dto/PhaseEmptyDataDTO.java

@@ -17,17 +17,17 @@ public class PhaseEmptyDataDTO {
     public static class Idx {
         private String crossId;
         /** 操作时间 */
-        private Integer curStamp;
+        private Long curStamp;
         private Integer rtnType;
         private String v1;
         private String v2;
         private String v3;
         private String v4;
         private String v5;
-        private Integer videoStamp;
+        private Long videoStamp;
         /** 信号机时间 */
-        private Integer signalMachineStamp;
-        private Integer createStamp;
+        private Long signalMachineStamp;
+        private Long createStamp;
         private String green_flow;
         private Integer countDown;
         private String green_info;

wj-datacenter-service/src/main/java/net/wanji/datacenter/service/impl/CrossStrategyOptServiceImpl.java

@@ -34,11 +34,11 @@ public class CrossStrategyOptServiceImpl implements CrossStrategyOptService {
             if (Objects.nonNull(phaseEmptyDataDTO)) {
                 PhaseEmptyDataDTO.Idx idx = phaseEmptyDataDTO.getIdx();
                 String crossId = idx.getCtrId();
-                Integer curStamp = idx.getCurStamp();
+                Long curStamp = idx.getCurStamp();
                 Integer countDown = idx.getCountDown();
                 Integer rtnType = idx.getRtnType();
-                Integer signalMachineStamp = idx.getSignalMachineStamp();
-                Integer createStamp = idx.getCreateStamp();
+                Long signalMachineStamp = idx.getSignalMachineStamp();
+                Long createStamp = idx.getCreateStamp();
                 Date date = new Date(curStamp);
                 CrossStrategyResultEntity entity = new CrossStrategyResultEntity();
                 entity.setCrossId(crossId);
@@ -50,6 +50,8 @@ public class CrossStrategyOptServiceImpl implements CrossStrategyOptService {
                 entity.setInsertTime(new Date(createStamp));
                 entity.setCountDown(countDown);
                 entity.setExtendTime(countDown);
+                entity.setResponseCode(rtnType);
+                entity.setRtnType(rtnType);
                 crossStrategyResultMapper.insert(entity);
             }
         } catch (JsonProcessingException e) {