[add] 绿波评价-绿波相位时差图

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

@@ -5,8 +5,8 @@ import cn.hutool.core.date.DateUnit;
 import cn.hutool.core.date.DateUtil;
 import cn.hutool.core.util.ObjectUtil;
 import net.wanji.common.enums.*;
-import net.wanji.databus.bo.CrossIdBO;
 import net.wanji.common.utils.tool.CrossUtil;
+import net.wanji.databus.bo.CrossIdBO;
 import net.wanji.databus.dao.entity.*;
 import net.wanji.databus.dao.mapper.*;
 import net.wanji.databus.po.*;
@@ -398,7 +398,8 @@ public class TrendServiceImpl implements TrendService {
         double noparkPassRate = greenwaveRealtimePO.getNoparkPassRate();
         res.setNoparkPassRate((int) (noparkPassRate * 100));
         res.setTrvalTime(greenwaveRealtimePO.getTrvalTime());
-        // 获取策略信息
+
+        // 策略列表
         List<String> strategyList = strategyMapper.selectGreenwaveAllNames();
         res.setStrategyList(strategyList);
         List<StrategyPO> strategyPOList = strategyMapper.selectByGreenwaveId(greenwaveId);
@@ -602,9 +603,12 @@ public class TrendServiceImpl implements TrendService {
                 distanceToNextCross = (int)nextCrossLen;
             }
             greenwaveCross.setDistanceToNextCross(distanceToNextCross);
-            // 计算平均速度
+            // 平均速度
             Double speed = calcSpeed(greenwaveCrossPO, crossId);
             greenwaveCross.setSpeed(speed);
+            // 相位差
+            greenwaveCross.setOffset(greenwaveCrossPO.getOffset());
+
             // 获取当前方案
             Integer sectionId = greenwaveCrossPO.getSectionId();
             CrossSectionPO crossSectionPO = baseCrossSectionMapper.selectById(sectionId);
@@ -613,7 +617,7 @@ public class TrendServiceImpl implements TrendService {
             }
             Integer currentSchemeId = crossSectionPO.getSchemeId();
             BaseCrossSchemePO baseCrossSchemePO = baseCrossSchemeMapper.selectById(currentSchemeId);
-            greenwaveCross.setOffset(baseCrossSchemePO.getOffset());
+
             // 构造相位时差图
             Integer absoluteOffset = absoluteOffsets.get(i);
             Integer crossSort = greenwaveCrossPO.getSort();
@@ -638,8 +642,9 @@ public class TrendServiceImpl implements TrendService {
         return res;
     }
 
-    private List<GreenwaveDetailVO.GreenwavePhase> getGreenwavePhaseList(BaseCrossSchemePO baseCrossSchemePO,
-                                                                         Integer absoluteOffset, Integer crossSort) {
+    private List<GreenwaveDetailVO.GreenwavePhase> getGreenwavePhaseList(
+            BaseCrossSchemePO baseCrossSchemePO, Integer absoluteOffset, Integer crossSort) {
+
         List<GreenwaveDetailVO.GreenwavePhase> res = new ArrayList<>();
         Integer schemeId = baseCrossSchemePO.getId();
         String crossId = baseCrossSchemePO.getCrossId();