Merge remote-tracking branch 'origin/master'

signal-optimize-service/src/main/java/net/wanji/opt/bo/AbnormalDetailBO.java

+package net.wanji.opt.bo;
+
+import com.fasterxml.jackson.annotation.JsonFormat;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import java.util.Date;
+
+/**
+ * @author Kent HAN
+ * @date 2023/6/9 13:52
+ */
+@Data
+@ApiModel(value = "AbnormalDetailBO", description = "异常事件详情")
+public class AbnormalDetailBO {
+    @ApiModelProperty(value = "路口ID")
+    private String crossId;
+
+    @ApiModelProperty(value = "小时分钟 HH:mm")
+    private String hourMinute;
+
+    @ApiModelProperty(value = "月日，格式 7/9")
+    @JsonFormat(shape = JsonFormat.Shape.STRING, pattern = "M/d", timezone = "GMT+8")
+    private Date problemDate;
+
+    @ApiModelProperty(value = "状态 0正常 1 失衡 2 拥堵 3 溢出 4 死锁")
+    private Integer status ;
+}

signal-optimize-service/src/main/java/net/wanji/opt/controller/SceneEvaluateController.java

@@ -6,14 +6,17 @@ import io.swagger.annotations.ApiResponse;
 import io.swagger.annotations.ApiResponses;
 import net.wanji.common.framework.rest.JsonViewObject;
 import net.wanji.databus.bo.CrossIdAndStartEndDateBO;
+import net.wanji.opt.bo.AbnormalDetailBO;
 import net.wanji.opt.service.impl.SceneEvaluateServiceImpl;
-import net.wanji.opt.vo.SceneEvaluateabnormalDistributeVO;
+import net.wanji.opt.vo.SceneEvaluateAbnormalDetailVO;
+import net.wanji.opt.vo.SceneEvaluateAbnormalDistributeVO;
 import org.springframework.web.bind.annotation.PostMapping;
 import org.springframework.web.bind.annotation.RequestBody;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RestController;
 
 import javax.ws.rs.core.MediaType;
+import java.text.ParseException;
 
 /**
  * 场景评价
@@ -36,11 +39,22 @@ public class SceneEvaluateController {
     @PostMapping(value = "/abnormalDistribute",
             produces = MediaType.APPLICATION_JSON, consumes = MediaType.APPLICATION_JSON)
     @ApiResponses({
-            @ApiResponse(code = 200, message = "OK", response = SceneEvaluateabnormalDistributeVO.class),
+            @ApiResponse(code = 200, message = "OK", response = SceneEvaluateAbnormalDistributeVO.class),
     })
     public JsonViewObject abnormalDistribute(@RequestBody CrossIdAndStartEndDateBO bo) {
-        SceneEvaluateabnormalDistributeVO res = sceneEvaluateService.abnormalDistribute(bo);
+        SceneEvaluateAbnormalDistributeVO res = sceneEvaluateService.abnormalDistribute(bo);
         return JsonViewObject.newInstance().success(res);
     }
 
+    @ApiOperation(value = "异常事件详情", notes = "异常事件详情", response = JsonViewObject.class,
+            produces = MediaType.APPLICATION_JSON, consumes = MediaType.APPLICATION_JSON)
+    @PostMapping(value = "/abnormalDetail",
+            produces = MediaType.APPLICATION_JSON, consumes = MediaType.APPLICATION_JSON)
+    @ApiResponses({
+            @ApiResponse(code = 200, message = "OK", response = SceneEvaluateAbnormalDetailVO.class),
+    })
+    public JsonViewObject abnormalDetail(@RequestBody AbnormalDetailBO abnormalDetailBO) throws ParseException {
+        SceneEvaluateAbnormalDetailVO res = sceneEvaluateService.abnormalDetail(abnormalDetailBO);
+        return JsonViewObject.newInstance().success(res);
+    }
 }
\ No newline at end of file

signal-optimize-service/src/main/java/net/wanji/opt/service/SceneEvaluateService.java

 package net.wanji.opt.service;
 
 import net.wanji.databus.bo.CrossIdAndStartEndDateBO;
-import net.wanji.opt.vo.SceneEvaluateabnormalDistributeVO;
+import net.wanji.opt.bo.AbnormalDetailBO;
+import net.wanji.opt.vo.SceneEvaluateAbnormalDetailVO;
+import net.wanji.opt.vo.SceneEvaluateAbnormalDistributeVO;
+
+import java.text.ParseException;
 
 public interface SceneEvaluateService {
 
-    SceneEvaluateabnormalDistributeVO abnormalDistribute(CrossIdAndStartEndDateBO bo);
+    SceneEvaluateAbnormalDistributeVO abnormalDistribute(CrossIdAndStartEndDateBO bo);
+
+    SceneEvaluateAbnormalDetailVO abnormalDetail(AbnormalDetailBO abnormalDetailBO) throws ParseException;
 }

signal-optimize-service/src/main/java/net/wanji/opt/vo/SceneEvaluateAbnormalDetailVO.java

+package net.wanji.opt.vo;
+
+import io.swagger.annotations.ApiModel;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+
+/**
+ * @author Kent HAN
+ * @date 2023/2/9 8:38
+ */
+@Data
+@NoArgsConstructor
+@ApiModel(value = "SceneEvaluateAbnormalDetailVO", description = "异常事件详情")
+public class SceneEvaluateAbnormalDetailVO {
+
+}

signal-optimize-service/src/main/java/net/wanji/opt/vo/SceneEvaluateabnormalDistributeVO.java → signal-optimize-service/src/main/java/net/wanji/opt/vo/SceneEvaluateAbnormalDistributeVO.java

@@ -15,8 +15,8 @@ import java.util.List;
  */
 @Data
 @NoArgsConstructor
-@ApiModel(value = "SceneEvaluateabnormalDistributeVO", description = "异常事件时空分布")
-public class SceneEvaluateabnormalDistributeVO {
+@ApiModel(value = "SceneEvaluateAbnormalDistributeVO", description = "异常事件时空分布")
+public class SceneEvaluateAbnormalDistributeVO {
     @ApiModelProperty(value = "拥堵次数")
     Integer congestionTimes;
     @ApiModelProperty(value = "失衡次数")

wj-databus/src/main/java/net/wanji/databus/dao/mapper/CrossDataHistMapper.java

@@ -27,5 +27,5 @@ public interface CrossDataHistMapper extends BaseMapper<CrossDataHistPO> {
 
     Double selectMaxSaturation(String crossId, int startStamp, int endStamp);
 
-    Integer selectCrossEmergencyCount(String crossId, int startTimeStamp, int endTimeStamp);
+    Integer selectCrossEmergencyCount(String crossId, int startStamp, int endStamp);
 }

wj-databus/src/main/java/net/wanji/databus/po/CrossTurnDataRealtimePO.java

@@ -89,10 +89,6 @@ public class CrossTurnDataRealtimePO {
     @ApiModelProperty(name = "修改时间",notes = "")
     public Date gmtModified ;
 
-    @ApiModelProperty(value = "绿灯间隔清空率", notes = "")
-    public Double clearRate;
-    @ApiModelProperty(value = "负载均衡度", notes = "")
-    public Double loadBalance;
     @ApiModelProperty(value = "绿灯有效利用率", notes = "")
     public Double greenLightEfficiency;
     @ApiModelProperty(name = "溢流率：交叉口间路段车辆排队长度超出可容纳空间的时长与观测总时长的百分比",notes = "")