转向接口优化

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

@@ -318,10 +318,13 @@ public class TrendController {
             String[] turnArr = turns.split(",");
             for (int i =0; i < turnArr.length; i++){
                 String[] s = turnArr[i].split("-");
+                String t = TurnConvertEnum.getCodeByKey(Integer.parseInt(s[1]));
                 if (i < turnArr.length - 1) {
                     inDir.append(s[0]).append(",");
-                    String t = TurnConvertEnum.getCodeByKey(Integer.parseInt(s[0]));
                     turnType.append(t).append(",");
+                }else {
+                    inDir.append(s[0]);
+                    turnType.append(t);
                 }
             }
             lanePeriodTurnVO.setInDir(inDir.toString());

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

@@ -1717,7 +1717,6 @@ public class TrendServiceImpl implements TrendService {
             if(po.getSturation() != null) {
                 //保留小数点后两位
                 vo.setSaturation(Math.round(po.getSturation() * 100) / 100.0);
-                vo.setSaturation(po.getSturation());
             }
             //拥堵指数
             vo.setCongestionIndex(0.0);
@@ -1763,19 +1762,19 @@ public class TrendServiceImpl implements TrendService {
             vo.setTrafficAccidentNum(0);
             //不停车通过率
             if (po.getNoStopRate() != null) {
-                vo.setNoStopPassRate(po.getNoStopRate());
+                vo.setNoStopPassRate(Math.round(po.getNoStopRate() * 100) / 100.0);
             }else {
                 vo.setNoStopPassRate(0);
             }
             //一次停车通过率
             if (po.getOneStopRate() != null) {
-                vo.setOneStopPassRate(po.getOneStopRate());
+                vo.setOneStopPassRate(Math.round(po.getOneStopRate() * 100) / 100.0);
             }else {
                 vo.setOneStopPassRate(0);
             }
             //二次停车通过率
             if (po.getTwoStopRate() != null) {
-                vo.setTwoStopPassRate(po.getTwoStopRate());
+                vo.setTwoStopPassRate(Math.round(po.getTwoStopRate() * 100) / 100.0);
             }else {
                 vo.setTwoStopPassRate(0);
             }