[add] 优化监测-AI干线优化

signal-optimize-service/src/main/java/net/wanji/opt/common/enums/GreenBeltDirEnum.java

@@ -4,20 +4,25 @@ import lombok.AllArgsConstructor;
 import lombok.Getter;
 import net.wanji.common.utils.tool.StringUtils;
 
+import java.util.Objects;
+
 /**
  * @author duanruiming
  * @date 2024/12/03 19:14
+ * @description
  */
 @Getter
 @AllArgsConstructor
 public enum GreenBeltDirEnum {
-    E2W("e2w", "东向西"),
-    W2E("w2e", "西向东"),
-    N2S("n2s", "北向南"),
-    S2N("s2n", "南向北");
+    //
+    E2W("e2w", "东向西", 3),
+    W2E("w2e", "西向东", 7),
+    N2S("n2s", "北向南", 1),
+    S2N("s2n", "南向北", 5);
 
     private String code;
     private String desc;
+    private Integer inDir;
 
     public static String getDesc(String code) {
         for (GreenBeltDirEnum dirEnum : GreenBeltDirEnum.values()) {
@@ -27,4 +32,22 @@ public enum GreenBeltDirEnum {
         }
         return "";
     }
+
+    public static Integer getInDir(String code) {
+        for (GreenBeltDirEnum value : GreenBeltDirEnum.values()) {
+            if (StringUtils.equalsIgnoreCase(code, value.getCode())) {
+                return value.getInDir();
+            }
+        }
+        return 1;
+    }
+
+    public static String getInDirName(Integer dir) {
+        for (GreenBeltDirEnum value : GreenBeltDirEnum.values()) {
+            if (Objects.equals(dir, value.getInDir())) {
+                return value.getDesc();
+            }
+        }
+        return "";
+    }
 }

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

@@ -55,13 +55,13 @@ public class GreenBeltController {
             @ApiResponse(code = 200, message = "OK", response = GreenBeltSpeedWidthVO.class),
     })
     public JsonViewObject greenBeltSpeedWidth(Integer greenId) {
-        Map<String, List<GreenBeltSpeedWidthVO>> map = Collections.EMPTY_MAP;
+        List<GreenBeltSpeedWidthVO> list = Collections.EMPTY_LIST;
         try {
-            map = greenBeltInfoService.greenBeltSpeedWidth(greenId);
+            list = greenBeltInfoService.greenBeltSpeedWidth(greenId);
         } catch (Exception e) {
             JsonViewObject.newInstance().fail("绿波带宽曲线异常");
         }
-        return JsonViewObject.newInstance().success(map);
+        return JsonViewObject.newInstance().success(list);
     }
 
     @ApiOperation(value = "绿波关键路口流量绿信比", notes = "优化监测-绿波关键路口流量绿信比", response = JsonViewObject.class,
@@ -71,13 +71,13 @@ public class GreenBeltController {
             @ApiResponse(code = 200, message = "OK", response = GreenBeltKeyCrossFlowTimeVO.class),
     })
     public JsonViewObject greenBeltKeyCrossFlowTime(Integer greenId) {
-        Map<String, List<GreenBeltKeyCrossFlowTimeVO>> map = Collections.EMPTY_MAP;
+        List<GreenBeltKeyCrossFlowTimeVO> list = Collections.EMPTY_LIST;
         try {
-            map = greenBeltInfoService.greenBeltKeyCrossFlowTime(greenId);
+            list = greenBeltInfoService.greenBeltKeyCrossFlowTime(greenId);
         } catch (Exception e) {
             JsonViewObject.newInstance().fail("绿波带宽曲线异常");
         }
-        return JsonViewObject.newInstance().success(map);
+        return JsonViewObject.newInstance().success(list);
     }
 
     @ApiOperation(value = "干线详情", notes = "优化监测-干线详情", response = JsonViewObject.class,

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

@@ -6,15 +6,13 @@ import net.wanji.opt.vo.GreenBeltKeyCrossFlowTimeVO;
 import net.wanji.opt.vo.GreenBeltSpeedWidthVO;
 
 import java.util.List;
-import java.util.Map;
-
 /**
  * @author duanruiming
  * @date 2024/11/19 18:07
  */
 public interface GreenBeltInfoService {
     List<GreenBeltFlowStopTimeVO> greenBeltCrossDetailHist(Integer greenId) throws Exception;
-    Map<String, List<GreenBeltSpeedWidthVO>> greenBeltSpeedWidth(Integer greenId) throws Exception;
-    Map<String, List<GreenBeltKeyCrossFlowTimeVO>> greenBeltKeyCrossFlowTime(Integer greenId) throws Exception;
+    List<GreenBeltSpeedWidthVO> greenBeltSpeedWidth(Integer greenId) throws Exception;
+    List<GreenBeltKeyCrossFlowTimeVO> greenBeltKeyCrossFlowTime(Integer greenId) throws Exception;
     GreenBeltCrossDetailVO greenBeltCrossDetailList(Integer greenId) throws Exception;
 }

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

 package net.wanji.opt.vo;
 
 import com.fasterxml.jackson.annotation.JsonFormat;
+import com.fasterxml.jackson.databind.annotation.JsonSerialize;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
+import net.wanji.opt.config.Double2TwoDecimalPlacesSerializer;
 
 import java.util.Date;
+import java.util.List;
 
 /**
  * @author duanruiming
@@ -14,17 +17,26 @@ import java.util.Date;
 @Data
 @ApiModel(value = "优化监测-绿波关键路口流量绿信比实体")
 public class GreenBeltKeyCrossFlowTimeVO {
+    @ApiModelProperty("干线方向")
+    private String dirName;
+    @ApiModelProperty("路口名称")
+    private String crossName;
+    private List<Detail> detailList;
+    @Data
+    public static class Detail {
         @ApiModelProperty("路口编号")
         private String crossId;
+        @ApiModelProperty("干线方向")
+        private String dir;
         @ApiModelProperty("路口名称")
         private String crossName;
         @ApiModelProperty("时间")
         @JsonFormat(shape = JsonFormat.Shape.STRING, pattern = "HH:mm:ss", timezone = "GMT+8")
         private Date startTime;
-    @ApiModelProperty("干线方向")
-    private String dirName;
         @ApiModelProperty("流量")
         private Integer flow;
         @ApiModelProperty("绿信比")
+        @JsonSerialize(using = Double2TwoDecimalPlacesSerializer.class)
         private Double greenTimeRatio;
+    }
 }

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

@@ -8,6 +8,7 @@ import lombok.Data;
 import net.wanji.opt.config.Double2TwoDecimalPlacesSerializer;
 
 import java.util.Date;
+import java.util.List;
 
 /**
  * @author duanruiming
@@ -16,15 +17,21 @@ import java.util.Date;
 @Data
 @ApiModel(value = "优化监测-绿波带宽曲线实体")
 public class GreenBeltSpeedWidthVO {
+    @ApiModelProperty("干线方向名称")
+    private String dirName;
+    private List<Detail> detailList;
+    @Data
+    public static class Detail {
         @ApiModelProperty("时间")
         @JsonFormat(shape = JsonFormat.Shape.STRING, pattern = "HH:mm:ss", timezone = "GMT+8")
         private Date startTime;
         @ApiModelProperty("干线方向")
-    private String dirName;
+        private String dir;
         @ApiModelProperty("速度")
         @JsonSerialize(using = Double2TwoDecimalPlacesSerializer.class)
         private Double speed;
         @ApiModelProperty("带宽")
         @JsonSerialize(using = Double2TwoDecimalPlacesSerializer.class)
         private Double width;
+    }
 }

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

@@ -53,6 +53,7 @@ public interface CrossDirDataHistMapper extends BaseMapper<CrossDirDataHistPO> {
     List<CrossDirDataHistPO> selectByCrossIdsDirsAndTimestamp(List<String> crossIdList, List<Integer> dirCodeList, int startTimeStamp, int endTimeStamp);
 
     List<CrossDirDataHistPO> selectByCrossIdDirsAndTimestamp(String crossId, List<Integer> dirCodeList, int startTimeStamp, int endTimeStamp);
+    List<CrossDirDataHistPO> selectDirDataList(String crossId, List<Integer> dirCodeList, int startTimeStamp, int endTimeStamp);
 
     List<CrossDirDataHistPO> selectByCrossDirAndTimeSection(
             @Param("crossId") String crossId,