Merge branch 'master' of http://106.120.201.126:14725/signal/traffic-signal-platform

 Conflicts:
	signal-optimize-service/src/main/java/net/wanji/opt/service/impl/EventServiceImpl.java

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

@@ -458,6 +458,7 @@ public class TrendServiceImpl implements TrendService {
         //String serviceLevel = CrossUtil.getServiceLevel(sturation);
         abnormalCrossDetailVO.setServiceLevel(crossDataRealtimePO.getServiceLevel());
         abnormalCrossDetailVO.setHourFlow(crossDataRealtimePO.getFlow() * 12);
+        abnormalCrossDetailVO.setHourFlow(crossDataRealtimePO.getFlow());
         BigDecimal bigDecimal = BigDecimal.valueOf(crossDataRealtimePO.getTrafficIndex()).setScale(2, RoundingMode.HALF_UP);
         abnormalCrossDetailVO.setCongestionIndex(bigDecimal);
         abnormalCrossDetailVO.setTrafficIndex(bigDecimal);

signal-optimize-service/src/main/java/net/wanji/opt/synthesis/pojo/StrategyFactoryEntity.java

@@ -19,6 +19,9 @@ public class StrategyFactoryEntity {
     @ApiModelProperty("自增Id")
     @TableId(value = "id", type = IdType.AUTO)
     private Integer id;
+    @ApiModelProperty("类型")
+    @TableField("type")
+    private Integer type;
     @ApiModelProperty("场景")
     @TableField("scene")
     private Integer scene;
@@ -31,6 +34,9 @@ public class StrategyFactoryEntity {
     @ApiModelProperty("算法厂商")
     @TableField("company")
     private String company;
+    @ApiModelProperty("优化方法")
+    @TableField("method")
+    private String method;
     @ApiModelProperty("策略详情")
     @TableField("mark")
     private String mark;

signal-optimize-service/src/main/java/net/wanji/opt/synthesis/pojo/vo/StrategyFactoryQueryVO.java

@@ -10,6 +10,8 @@ import lombok.Data;
 @Data
 public class StrategyFactoryQueryVO {
 
+    @ApiModelProperty("类型 1 单点 2干线 3区域")
+    private Integer type;
     @ApiModelProperty("场景")
     private Integer scene;
     @ApiModelProperty("策略")

signal-optimize-service/src/main/java/net/wanji/opt/synthesis/service/impl/StrategyControlServiceImpl.java

@@ -870,6 +870,9 @@ public class StrategyControlServiceImpl implements StrategyControlService {
     public JsonViewObject strategyFactoryList(StrategyFactoryQueryVO vo) throws Exception {
         Page<StrategyFactoryEntity> page = new Page<>(vo.getCurrentPage(), vo.getPageSize());
         LambdaQueryWrapper<StrategyFactoryEntity> queryWrapper = new LambdaQueryWrapper<>();
+        if (Objects.nonNull(vo.getType())) {
+            queryWrapper.eq(StrategyFactoryEntity::getType, vo.getType());
+        }
         if (Objects.nonNull(vo.getScene())) {
             queryWrapper.eq(StrategyFactoryEntity::getScene, vo.getScene());
         }

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

@@ -47,6 +47,8 @@ public class AbnormalCrossDetailVO {
     private String serviceLevel;
     @ApiModelProperty(value = "小时流量")
     private Integer hourFlow;
+    @ApiModelProperty(value = "分钟流量")
+    private Integer minuteFlow;
 
     @NoArgsConstructor
     @Data