[add] 路网优化检测AI优化历史优化

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

@@ -28,7 +28,7 @@ public class GreenBeltController {
     @Resource
     private GreenBeltInfoService greenBeltInfoService;
 
-    @ApiOperation(value = "绿波协调方向流量停车次数", notes = "绿波协调方向流量停车次数", response = JsonViewObject.class,
+    @ApiOperation(value = "绿波协调方向路口流量停车次数", notes = "绿波协调方向路口流量停车次数", response = JsonViewObject.class,
             produces = MediaType.APPLICATION_JSON, consumes = MediaType.APPLICATION_JSON)
     @GetMapping(value = "/greenBeltCrossDetailHist")
     @ApiResponses({

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

@@ -31,15 +31,10 @@ public class GreenBeltServiceImpl implements GreenBeltInfoService {
     @Override
     public List<GreenBeltFlowStopTimeVO> greenBeltCrossDetailHist(Integer greenId) {
         List<String> crossIds = greenwaveInfoMapper.selectCrossIdsById(greenId);
-        LocalDate currentDate = LocalDate.now();
-        LocalTime startTime = LocalTime.MIDNIGHT; // 00:00
-        LocalDateTime startOfDay = LocalDateTime.of(currentDate, startTime);
-        LocalDate nextDate = currentDate.plusDays(1);
-        LocalTime endTime = LocalTime.MIDNIGHT; // 00:00 of the next day
-        LocalDateTime endOfDay = LocalDateTime.of(nextDate, endTime);
-        long startSecond = startOfDay.toEpochSecond(ZoneOffset.of("+8")) + 5 * 600;
-        long endSecond = endOfDay.toEpochSecond(ZoneOffset.of("+8"));
-        List<CrossDataHistPO> crossDataHistPOS = crossDataHistMapper.selectByCrossIdsAndTimestamp(crossIds, (int) startSecond , (int) endSecond);
+        long currentTimeMillis = System.currentTimeMillis();
+        int startSecond = (int) (currentTimeMillis / 1000 - 3600);
+        int endSecond = (int) (currentTimeMillis / 1000);
+        List<CrossDataHistPO> crossDataHistPOS = crossDataHistMapper.selectByCrossIdsAndTimestamp(crossIds, startSecond , endSecond);
         if (!CollectionUtils.isEmpty(crossDataHistPOS)) {
             List<GreenBeltFlowStopTimeVO> results = new ArrayList<>();
             Map<Date, List<CrossDataHistPO>> startTimeMap = crossDataHistPOS.stream().collect(Collectors.groupingBy(CrossDataHistPO::getStartTime));
@@ -55,6 +50,8 @@ public class GreenBeltServiceImpl implements GreenBeltInfoService {
                         flowStopTimeDetail.setFlow(crossDataHistPO.getFlow());
                         flowStopTimeDetail.setStopTimes(crossDataHistPO.getStopTimes());
                         flowStopTimeDetail.setCrossId(crossDataHistPO.getCrossId());
+                        // todo 先删除，后续通过路口距离/速度计算 距离通过卫博发送数据
+                        flowStopTimeDetail.setTravelTime(0.0);
                         crossList.add(flowStopTimeDetail);
                     }
                 }

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

@@ -77,7 +77,18 @@ public class StrategyControlController {
     }
 
 
-    @ApiOperation(value = "路网优化监测", notes = "路网优化监测",
+    @ApiOperation(value = "AI优化次数优化时长", notes = "路网优化检测-AI优化次数优化时长",
+            response = JsonViewObject.class,
+            produces = MediaType.APPLICATION_JSON, consumes = MediaType.APPLICATION_JSON)
+    @GetMapping(value = "/strategyOptTimes")
+    @ApiResponses({
+            @ApiResponse(code = 200, message = "OK", response = StrategyControlDataEntity.class),
+    })
+    public JsonViewObject strategyOptTimes() throws Exception {
+        return strategyControlService.strategyOptTimes();
+    }
+
+    @ApiOperation(value = "路网优化监测-接口干线列表", notes = "路网优化监测-AI路口-AI干线",
             response = JsonViewObject.class,
             produces = MediaType.APPLICATION_JSON, consumes = MediaType.APPLICATION_JSON)
     @GetMapping(value = "/crossOptInfoList")

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

@@ -24,7 +24,7 @@ import java.util.List;
  * @date 2024/11/19 20:10
  * @description 神思推送绿波时序图
  */
-@Api(value = "StrategyGreenBeltController", description = "策略绿波带")
+@Api(value = "StrategyGreenBeltController", description = "策略绿波带弹窗")
 @RequestMapping("/strategyBelt")
 @RestController
 public class StrategyGreenBeltController {

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

+package net.wanji.opt.synthesis.pojo.vo;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+/**
+ * @author duanruiming
+ * @date 2024/12/04 13:58
+ */
+@Data
+@ApiModel("AI优化次数优化时长返回实体")
+public class StrategyOptTimesVO {
+    @ApiModelProperty("优化次数")
+    private Integer count;
+    @ApiModelProperty("优化时长")
+    private Integer times;
+}

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

@@ -15,6 +15,7 @@ public interface StrategyControlService {
 
     JsonViewObject strategyInfoPageList(StrategyControlDataEntity entity) throws Exception;
     JsonViewObject crossStrategyInfoList(Integer type) throws Exception;
+    JsonViewObject strategyOptTimes() throws Exception;
     JsonViewObject crossStrategyHistList() throws Exception;
     JsonViewObject crossOptInfoList(Integer type) throws Exception;
 

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

@@ -86,6 +86,7 @@ public class StrategyGreenBeltServiceImpl implements StrategyGreenBeltService {
                 vo.setHourMinute(DateUtils.format(greenwaveHistPO.getStartTime(), "HH:mm"));
                 vo.setStopTimes(greenwaveHistPO.getStopTimes());
                 vo.setCordQueueRatio(greenwaveHistPO.getCordQueueRatio() * 100);
+                vo.setTravelTime(greenwaveHistPO.getTrvalTime());
                 results.add(vo);
             }
         }

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

@@ -29,5 +29,7 @@ public class GreenBeltFlowStopTimeVO {
         private Integer flow;
         @ApiModelProperty("停车次数")
         private Double stopTimes;
+        @ApiModelProperty("行程时间")
+        private Double travelTime;
     }
 }

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

@@ -27,4 +27,6 @@ public class GreenBeltStopTimesQueueLengthVO {
     private Double stopTimes;
     @ApiModelProperty("空间占比")
     private Double cordQueueRatio;
+    @ApiModelProperty("行程时间")
+    private Integer travelTime;
 }