[add] 新信号评价-运行评价-异常事件详情

signal-control-service/src/main/java/net/wanji/web/controller/FeignController.java

+package net.wanji.web.controller;
+
+import net.wanji.web.service.impl.CrossManageServiceImpl;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+
+import java.util.Date;
+
+/**
+ * @author hanbing
+ * @date 2023/01/04 16:10
+ */
+@RequestMapping("/control")
+@RestController
+public class FeignController {
+
+    private final CrossManageServiceImpl crossManageServiceImpl;
+
+    public FeignController(CrossManageServiceImpl crossManageServiceImpl) {
+        this.crossManageServiceImpl = crossManageServiceImpl;
+    }
+
+    @PostMapping("/findPlanId")
+    public Integer findPlanId(Date datetime, String dateStr, String crossId) {
+        Integer planId = crossManageServiceImpl.findPlanId(datetime, dateStr, crossId);
+        return planId;
+    }
+}

signal-control-service/src/main/java/net/wanji/web/service/impl/CrossManageServiceImpl.java

@@ -508,7 +508,7 @@ public class CrossManageServiceImpl implements CrossManageService {
         return timeInt;
     }
 
-    private Integer findPlanId(Date datetime, String dateStr, String crossId) {
+    public Integer findPlanId(Date datetime, String dateStr, String crossId) {
         CrossIdBO crossIdBO = new CrossIdBO();
         crossIdBO.setCrossId(crossId);
         RunningPlanDTO runningPlanDTO = runningPlanServiceImpl.listRunningPlan(crossIdBO);

signal-feign-service/src/main/java/net/wanji/feign/config/FeignControlClientsConfig.java

+package net.wanji.feign.config;
+
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.beans.factory.annotation.Value;
+import org.springframework.cloud.openfeign.EnableFeignClients;
+import org.springframework.context.annotation.Bean;
+import org.springframework.context.annotation.Configuration;
+
+/**
+ * @author duanruiming
+ * @date 2023/01/09 15:23
+ */
+@Configuration(value = "FeignControlClientsConfig")
+@EnableFeignClients(basePackages = "net.wanji.feign")
+@Slf4j
+public class FeignControlClientsConfig {
+
+    @Value("${control.url}")
+    private String url;
+    @Bean
+    public void testUrl() {
+        log.info("===========feign config url control:" + url);
+    }
+}

signal-feign-service/src/main/java/net/wanji/feign/service/ControlFeignClients.java

+package net.wanji.feign.service;
+
+import net.wanji.feign.config.FeignControlClientsConfig;
+import net.wanji.feign.service.common.FeignCommon;
+import org.springframework.cloud.openfeign.FeignClient;
+
+/**
+ * @author duanruiming
+ * @date 2023/05/19 9:05
+ */
+@FeignClient(name = "ControlFeignClients", url = "${control.url}",
+        configuration = FeignControlClientsConfig.class)
+public interface ControlFeignClients extends FeignCommon {
+}

signal-feign-service/src/main/java/net/wanji/feign/service/UtcDTFeignClients.java

 package net.wanji.feign.service;
 
 import net.wanji.feign.config.FeignDTClientsConfig;
-import net.wanji.feign.service.common.UtcFeignCommon;
+import net.wanji.feign.service.common.FeignCommon;
 import org.springframework.cloud.openfeign.FeignClient;
 
 /**
@@ -9,5 +9,5 @@ import org.springframework.cloud.openfeign.FeignClient;
  * @date 2023/05/19 9:05
  */
 @FeignClient(name = "UtcDTFeignClients", url = "${utc.dt.service.url}", configuration = FeignDTClientsConfig.class)
-public interface UtcDTFeignClients extends UtcFeignCommon {
+public interface UtcDTFeignClients extends FeignCommon {
 }

signal-feign-service/src/main/java/net/wanji/feign/service/UtcFeignClients.java

 package net.wanji.feign.service;
 
 import net.wanji.feign.config.FeignClientsConfig;
-import net.wanji.feign.service.common.UtcFeignCommon;
+import net.wanji.feign.service.common.FeignCommon;
 import org.springframework.cloud.openfeign.FeignClient;
 
 /**
@@ -9,5 +9,5 @@ import org.springframework.cloud.openfeign.FeignClient;
  * @date 2023/01/09 15:29
  */
 @FeignClient(name = "UtcFeignClients", url = "${utc.service.url}", configuration = FeignClientsConfig.class)
-public interface UtcFeignClients extends UtcFeignCommon {
+public interface UtcFeignClients extends FeignCommon {
 }

signal-feign-service/src/main/java/net/wanji/feign/service/UtcHisenseFeignClients.java

 package net.wanji.feign.service;
 
 import net.wanji.feign.config.FeignHisenseClientsConfig;
-import net.wanji.feign.service.common.UtcFeignCommon;
+import net.wanji.feign.service.common.FeignCommon;
 import org.springframework.cloud.openfeign.FeignClient;
 
 /**
@@ -10,5 +10,5 @@ import org.springframework.cloud.openfeign.FeignClient;
  */
 @FeignClient(name = "UtcHisenseFeignClients", url = "${utc.hisense.service.url}",
         configuration = FeignHisenseClientsConfig.class)
-public interface UtcHisenseFeignClients extends UtcFeignCommon {
+public interface UtcHisenseFeignClients extends FeignCommon {
 }

signal-feign-service/src/main/java/net/wanji/feign/service/common/UtcFeignCommon.java → signal-feign-service/src/main/java/net/wanji/feign/service/common/FeignCommon.java

@@ -15,7 +15,7 @@ import java.util.Date;
  * @author duanruiming
  * @date 2023/05/19 15:48
  */
-public interface UtcFeignCommon {
+public interface FeignCommon {
 
     /**
      * 信号机状态
@@ -108,4 +108,7 @@ public interface UtcFeignCommon {
     // 临时方案
     @PostMapping("/tempScheme")
     JsonViewObject tempScheme(@RequestParam String crossCode, @RequestParam Integer schemeNo);
+
+    @PostMapping("/control/findPlanId")
+    Integer findPlanId(@RequestParam Date datetime, @RequestParam String dateStr, @RequestParam String crossId);
 }

signal-feign-service/src/main/resources/application-dev.properties

 utc.service.url=http://10.102.1.182:32000/utc
 utc.dt.service.url=http://10.102.1.182:39002/utc-dt
-utc.hisense.service.url=http://10.102.1.182:39003/utc-hisense
\ No newline at end of file
+utc.hisense.service.url=http://10.102.1.182:39003/utc-hisense
+control.url=http://10.102.1.182:32001/web

signal-feign-service/src/main/resources/application-devjinan.properties

 utc.service.url=http://10.102.1.182:32000/utc
 utc.dt.service.url=http://10.102.1.182:39002/utc-dt
-utc.hisense.service.url=http://10.102.1.182:39003/utc-hisense
\ No newline at end of file
+utc.hisense.service.url=http://10.102.1.182:39003/utc-hisense
+control.url=http://localhost:32001/web
+

signal-feign-service/src/main/resources/application-docker.properties

 utc.service.url=http://172.17.0.1:32000/utc
 utc.dt.service.url=http://172.17.0.1:39002/utc-dt
-utc.hisense.service.url=http://172.17.0.1:39003/utc-hisense
\ No newline at end of file
+utc.hisense.service.url=http://172.17.0.1:39003/utc-hisense
+control.url=http://172.17.0.1:32001/web

signal-feign-service/src/main/resources/application-jinan.properties

 utc.service.url=http://172.17.0.1:32000/utc
 utc.dt.service.url=http://172.17.0.1:39002/utc-dt
-utc.hisense.service.url=http://172.17.0.1:39003/utc-hisense
\ No newline at end of file
+utc.hisense.service.url=http://172.17.0.1:39003/utc-hisense
+control.url=http://172.17.0.1:32001/web

signal-feign-service/src/main/resources/application-local.properties

 utc.service.url=http://localhost:32000/utc
 utc.dt.service.url=http://localhost:39002/utc-dt
-utc.hisense.service.url=http://localhost:39003/utc-hisense
\ No newline at end of file
+utc.hisense.service.url=http://localhost:39003/utc-hisense
+control.url=http://localhost:32001/web

signal-feign-service/src/main/resources/application-police.properties

 utc.service.url=http://localhost:32000/utc
 utc.dt.service.url=http://localhost:39002/utc-dt
-utc.hisense.service.url=http://localhost:39003/utc-hisense
\ No newline at end of file
+utc.hisense.service.url=http://localhost:39003/utc-hisense
+control.url=http://localhost:32001/web

signal-feign-service/src/main/resources/application-prod.properties

 utc.service.url=http://172.17.0.1:32000/utc
 utc.dt.service.url=http://172.17.0.1:39002/utc-dt
-utc.hisense.service.url=http://172.17.0.1:39003/utc-hisense
\ No newline at end of file
+utc.hisense.service.url=http://172.17.0.1:39003/utc-hisense
+control.url=http://172.17.0.1:32001/web

signal-feign-service/src/main/resources/application-uat.properties

 utc.service.url=http://172.17.0.1:32000/utc
 utc.dt.service.url=http://172.17.0.1:39002/utc-dt
-utc.hisense.service.url=http://172.17.0.1:39003/utc-hisense
\ No newline at end of file
+utc.hisense.service.url=http://172.17.0.1:39003/utc-hisense
+control.url=http://172.17.0.1:32001/web

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

 package net.wanji.opt.vo;
 
+import com.fasterxml.jackson.annotation.JsonFormat;
 import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 import lombok.NoArgsConstructor;
 
+import java.util.Date;
+import java.util.List;
+
 /**
  * @author Kent HAN
  * @date 2023/2/9 8:38
@@ -12,5 +17,49 @@ import lombok.NoArgsConstructor;
 @NoArgsConstructor
 @ApiModel(value = "SceneEvaluateAbnormalDetailVO", description = "异常事件详情")
 public class SceneEvaluateAbnormalDetailVO {
+    @ApiModelProperty(value = "事件类型",notes = "0正常 1 失衡  2 拥堵 3 溢出 4 死锁")
+    private Integer status ;
+
+    @ApiModelProperty(name = "开始时间：yyyy-MM-dd HH:mm")
+    @JsonFormat(shape = JsonFormat.Shape.STRING, pattern = "yyyy-MM-dd HH:mm", timezone = "GMT+8")
+    private Date startTime ;
+
+    // todo 目前只有拥堵，后期扩展考虑增加字段
+    @ApiModelProperty(value = "等级",notes = "0畅通 1轻度 2中度 3严重")
+    private Integer level ;
+
+    @ApiModelProperty(name = "持续时长（单位：分钟）")
+    private Integer duration ;
+
+    @ApiModelProperty(value = "方向列表：1北；2东北；3东；4东南；5南；6西南；7西；8西北")
+    private List<Integer> dirs;
+
+    @ApiModelProperty(value = "配时方案列表")
+    private List<String> patternNames;
+
+    @ApiModelProperty(value = "路口服务水平")
+    String serviceLevel;
+
+    @ApiModelProperty(value = "路口流量")
+    private Integer flow;
+
+    @ApiModelProperty(value = "指标数据")
+    List<SchemeEvaluateSchemeDetailOverallVO.OverallMetrics> overallMetricsList;
+
+    @NoArgsConstructor
+    @Data
+    public static class OverallMetrics {
+        @ApiModelProperty(value = "指标编号")
+        String metricCode;
+
+        @ApiModelProperty(value = "指标名称")
+        String metricName;
+
+        @ApiModelProperty(value = "指标数值")
+        Integer metricValue;
+
+        @ApiModelProperty(value = "指标数值单位")
+        String metricUnit;
+    }
 
 }

signal-utc-service/src/main/java/net/wanji/utc/cache/UtcFeignClientCache.java

@@ -2,7 +2,7 @@ package net.wanji.utc.cache;
 
 import net.wanji.common.enums.BaseEnum;
 import net.wanji.common.framework.spring.ServiceBeanContext;
-import net.wanji.feign.service.common.UtcFeignCommon;
+import net.wanji.feign.service.common.FeignCommon;
 import org.springframework.boot.CommandLineRunner;
 import org.springframework.stereotype.Component;
 
@@ -16,9 +16,9 @@ import java.util.Map;
 @Component
 public class UtcFeignClientCache implements CommandLineRunner {
 
-    public static final Map<String, UtcFeignCommon> utcFeignClientsMap = new HashMap<>();
+    public static final Map<String, FeignCommon> utcFeignClientsMap = new HashMap<>();
 
-    public UtcFeignCommon getUtcFeignClientService(String name) {
+    public FeignCommon getUtcFeignClientService(String name) {
         if (!utcFeignClientsMap.isEmpty()) {
             return utcFeignClientsMap.get(name);
         }
@@ -30,11 +30,11 @@ public class UtcFeignClientCache implements CommandLineRunner {
     }
 
     public void init() {
-        Map<String, UtcFeignCommon> interfaceBeanMap = ServiceBeanContext.getInterfaceBeanMap(UtcFeignCommon.class);
+        Map<String, FeignCommon> interfaceBeanMap = ServiceBeanContext.getInterfaceBeanMap(FeignCommon.class);
         if (!interfaceBeanMap.isEmpty()) {
-            for (Map.Entry<String, UtcFeignCommon> item : interfaceBeanMap.entrySet()) {
+            for (Map.Entry<String, FeignCommon> item : interfaceBeanMap.entrySet()) {
                 String feignName = item.getKey();
-                UtcFeignCommon utcFeignClientService = item.getValue();
+                FeignCommon utcFeignClientService = item.getValue();
                 for (BaseEnum.VendorTypeEnum value : BaseEnum.VendorTypeEnum.values()) {
                     if (feignName.contains(value.getNick())) {
                         utcFeignClientsMap.put(value.getNick(), utcFeignClientService);

signal-utc-service/src/main/java/net/wanji/utc/service/control/impl/WanJiControlCommandServiceImpl.java

@@ -3,7 +3,7 @@ package net.wanji.utc.service.control.impl;
 import lombok.RequiredArgsConstructor;
 import net.wanji.common.framework.rest.JsonViewObject;
 import net.wanji.databus.vo.*;
-import net.wanji.feign.service.common.UtcFeignCommon;
+import net.wanji.feign.service.common.FeignCommon;
 import net.wanji.utc.cache.CrossInfoCache;
 import net.wanji.utc.cache.UtcFeignClientCache;
 import net.wanji.utc.common.constant.Constants;
@@ -103,7 +103,7 @@ public class WanJiControlCommandServiceImpl implements ControlCommandService {
     @Override
     public JsonViewObject setSignalControl(String crossId, Integer command, Integer commandType) throws Exception {
         String manufacturerIdCode = crossInfoCache.getManufacturerCodeByCrossId(crossId);
-        UtcFeignCommon utcFeignClientService = utcFeignClientCache.getUtcFeignClientService(manufacturerIdCode);
+        FeignCommon utcFeignClientService = utcFeignClientCache.getUtcFeignClientService(manufacturerIdCode);
         JsonViewObject jsonViewObject = JsonViewObject.newInstance();
         ControlCommandVO controlCommandVO = new ControlCommandVO();
         controlCommandVO.setCrossCode(crossId);

wj-common/src/main/java/net/wanji/common/enums/StrategyAndMetricsEnum.java

@@ -43,7 +43,8 @@ public class StrategyAndMetricsEnum {
         LOAD_BALANCE("9", "负载均衡度", "", "loadBalance"),
         EFFUSION_RATE("10", "溢流率", "%", "effusionRate"),
         CLEAR_RATE("11", "绿灯间隔清空率", "%", "clearRate"),
-        EMERGENCY_COUNT("12", "三急一速数量", "", "emergencyCount");
+        EMERGENCY_COUNT("12", "三急一速数量", "", "emergencyCount"),
+        EMPTY_DISCHARGES("13", "空放次数", "次", "emptyDischarges");
 
         private final String code;
         private final String description;