[add] 代码提交

signal-optimize-service/src/main/java/net/wanji/opt/dao/mapper/GreenWaveRealTimeMapperV2Mapper.java

@@ -2,7 +2,7 @@ package net.wanji.opt.dao.mapper;
 
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import net.wanji.databus.dao.entity.GreenwaveRealtimePO;
-import net.wanji.opt.vo2.dto.GreenOptInfoDTO;
+import net.wanji.opt.vo2.dto.GreenOptDTO;
 
 import java.util.List;
 
@@ -12,5 +12,5 @@ import java.util.List;
  */
 public interface GreenWaveRealTimeMapperV2Mapper extends BaseMapper<GreenwaveRealtimePO> {
 
-    List<GreenOptInfoDTO> selectGreenOptInfoList();
+    List<GreenOptDTO> selectGreenOptInfoList();
 }

signal-optimize-service/src/main/java/net/wanji/opt/servicev2/implv2/TrendServiceV2Impl.java

@@ -18,7 +18,7 @@ import net.wanji.opt.servicev2.TrendServiceV2;
 import net.wanji.opt.vo2.*;
 import net.wanji.opt.vo2.dto.CrossLastOptResultDTO;
 import net.wanji.opt.vo2.dto.GreenLastOptResultDTO;
-import net.wanji.opt.vo2.dto.GreenOptInfoDTO;
+import net.wanji.opt.vo2.dto.GreenOptDTO;
 import org.springframework.beans.BeanUtils;
 import org.springframework.stereotype.Service;
 import org.springframework.util.CollectionUtils;
@@ -118,21 +118,21 @@ public class TrendServiceV2Impl implements TrendServiceV2 {
     @Override
     public List<GreenOptInfoVO> greenOptInfoList() throws Exception {
         List<GreenOptInfoVO> results = new ArrayList<>();
-        List<GreenOptInfoDTO> greenOptInfoDTOS = greenWaveRealTimeMapperV2Mapper.selectGreenOptInfoList();
+        List<GreenOptDTO> greenOptDTOS = greenWaveRealTimeMapperV2Mapper.selectGreenOptInfoList();
         long start = DateUtil.getCurrentTimeSecond();
         long end = start + 5 * 60;
         LambdaQueryWrapper<GreenwaveHistPO> queryWrapper = new LambdaQueryWrapper<>();
         queryWrapper.between(GreenwaveHistPO::getBatchTime, start, end);
         List<GreenwaveHistPO> greenwaveHistPOS = greenwaveHistMapper.selectList(queryWrapper);
-        if (!CollectionUtils.isEmpty(greenOptInfoDTOS)) {
-            for (GreenOptInfoDTO greenOptInfoDTO : greenOptInfoDTOS) {
-                Integer greenId = greenOptInfoDTO.getGreenId();
-                Double trafficIndex = greenOptInfoDTO.getTrafficIndex();
-                Integer speed = greenOptInfoDTO.getSpeed();
-                Integer travelTime = greenOptInfoDTO.getTravelTime();
-                greenOptInfoDTO.setStrategyName("效率提升");
-                String roadDirection = greenOptInfoDTO.getRoadDirection();
-                greenOptInfoDTO.setDirectionName(GreenBeltDirEnum.getDesc(roadDirection));
+        if (!CollectionUtils.isEmpty(greenOptDTOS)) {
+            for (GreenOptDTO greenOptDTO : greenOptDTOS) {
+                Integer greenId = greenOptDTO.getGreenId();
+                Double trafficIndex = greenOptDTO.getTrafficIndex();
+                Integer speed = greenOptDTO.getSpeed();
+                Integer travelTime = greenOptDTO.getTravelTime();
+                greenOptDTO.setStrategyName("效率提升");
+                String roadDirection = greenOptDTO.getRoadDirection();
+                greenOptDTO.setDirectionName(GreenBeltDirEnum.getDesc(roadDirection));
                 for (GreenwaveHistPO greenwaveHistPO : greenwaveHistPOS) {
                     Integer curGreenId = greenwaveHistPO.getGreenId();
                     String curDirection = greenwaveHistPO.getRoadDirection();
@@ -142,32 +142,32 @@ public class TrendServiceV2Impl implements TrendServiceV2 {
                     if (Objects.equals(greenId, curGreenId) && StringUtils.equals(roadDirection, curDirection)) {
 
                         if (trafficIndex > curTrafficIndex) {
-                            greenOptInfoDTO.setTrafficIndexUpDown(1);
+                            greenOptDTO.setTrafficIndexUpDown(1);
                         } else {
-                            greenOptInfoDTO.setTrafficIndexUpDown(0);
+                            greenOptDTO.setTrafficIndexUpDown(0);
                         }
                         if (speed > curSpeed.intValue()) {
-                            greenOptInfoDTO.setSpeedUpDown(1);
+                            greenOptDTO.setSpeedUpDown(1);
                         } else {
-                            greenOptInfoDTO.setSpeedUpDown(0);
+                            greenOptDTO.setSpeedUpDown(0);
                         }
                         if (travelTime > curTravelTime) {
-                            greenOptInfoDTO.setTravelUpDown(1);
+                            greenOptDTO.setTravelUpDown(1);
                         } else {
-                            greenOptInfoDTO.setTravelUpDown(0);
+                            greenOptDTO.setTravelUpDown(0);
                         }
                     }
 
                 }
             }
-            Map<Integer, List<GreenOptInfoDTO>> greenIdMap = greenOptInfoDTOS.stream().collect(Collectors.groupingBy(GreenOptInfoDTO::getGreenId));
-            for (Map.Entry<Integer, List<GreenOptInfoDTO>> entry : greenIdMap.entrySet()) {
+            Map<Integer, List<GreenOptDTO>> greenIdMap = greenOptDTOS.stream().collect(Collectors.groupingBy(GreenOptDTO::getGreenId));
+            for (Map.Entry<Integer, List<GreenOptDTO>> entry : greenIdMap.entrySet()) {
                 GreenOptInfoVO greenOptInfoVO = new GreenOptInfoVO();
                 Integer greenId = entry.getKey();
-                List<GreenOptInfoDTO> value = entry.getValue();
-                GreenOptInfoDTO greenOptInfoDTO = value.get(0);
+                List<GreenOptDTO> value = entry.getValue();
+                GreenOptDTO greenOptDTO = value.get(0);
                 greenOptInfoVO.setGreenId(greenId);
-                greenOptInfoVO.setGreenName(greenOptInfoDTO.getGreenName());
+                greenOptInfoVO.setGreenName(greenOptDTO.getGreenName());
                 greenOptInfoVO.setDetails(value);
                 results.add(greenOptInfoVO);
             }

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

@@ -3,7 +3,7 @@ package net.wanji.opt.vo2;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
-import net.wanji.opt.vo2.dto.GreenOptInfoDTO;
+import net.wanji.opt.vo2.dto.GreenOptDTO;
 
 import java.util.List;
 
@@ -19,5 +19,5 @@ public class GreenOptInfoVO {
     @ApiModelProperty(value = "绿波编号")
     private String greenName;
     @ApiModelProperty(value = "绿波详情列表")
-    private List<GreenOptInfoDTO> details;
+    private List<GreenOptDTO> details;
 }

signal-optimize-service/src/main/java/net/wanji/opt/vo2/dto/GreenOptInfoDTO.java → signal-optimize-service/src/main/java/net/wanji/opt/vo2/dto/GreenOptDTO.java

@@ -11,8 +11,8 @@ import net.wanji.opt.config.Double2TwoDecimalPlacesSerializer;
  * @date 2025/03/10 16:14
  */
 @Data
-@ApiModel(value = "GreenOptInfoDTO", description = "态势监测-区域体检-绿波优化列表")
-public class GreenOptInfoDTO {
+@ApiModel(value = "GreenOptDTO", description = "态势监测-区域体检-绿波优化列表")
+public class GreenOptDTO {
     @ApiModelProperty(value = "绿波编号")
     private Integer greenId;
     @ApiModelProperty(value = "绿波名称")

signal-optimize-service/src/main/resources/bootstrap.yaml

 spring:
   profiles:
-    active: docker
\ No newline at end of file
+    active: docker
+logging:
+  level:
+    org.apache.ibatis: DEBUG
\ No newline at end of file

signal-optimize-service/src/main/resources/mapper/GreenWaveRealTimeMapperV2.xml

@@ -3,7 +3,7 @@
 <mapper namespace="net.wanji.opt.dao.mapper.GreenWaveRealTimeMapperV2Mapper">
 
     <!-- 态势监测-区域体检-绿波列表 -->
-    <select id="selectGreenOptInfoList" resultType="net.wanji.opt.vo2.dto.GreenOptInfoDTO">
+    <select id="selectGreenOptInfoList" resultType="net.wanji.opt.vo2.dto.GreenOptDTO">
         select t2.green_id greenId, t1.name greenName, t2.road_direction roadDirection,
         t2.traffic_index trafficIndex, t1.wkt, t2.trval_time as travelTime, t2.speed
         from t_greenwave_info t1

signal-optimize-service/src/main/resources/mapper/judgeanalysis/AnalysisProblemCrossDayMapper.xml

 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="net.wanji.opt.dao.mapper.judgeanalysis.AnalysisProblemCrossDayMapper">
+<mapper namespace="net.wanji.opt.dao.mapper.trend.AnalysisProblemCrossDayMapper">
 
 <!-- 通用设置 -->