refactor(signal-optimize): 优化路口状态分布统计结果的键名命名

- 修改了 CrossMapper.xml 中的字段名，将 trunDirName 改为 turnDirName
- 更新了 CrossServiceImpl.java 中的 resultMap 键名生成逻辑，根据不同对象类型生成更合理的键名
- 调整了 CrossTurnInfoEntity.java 中字段的顺序，将 turnDirName 移到 dir 后面

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

@@ -39,23 +39,32 @@ public class CrossServiceImpl implements CrossService {
             String[] conditions = condition.split(";");
             for (String c : conditions) {
                 List<CrossStatusDistributionVO> list = getCrossStatusDistribution_SingleCondition(crossID, date, groupType, objectType, c);
-                resultMap.put(c + "_list", list);
+                resultMap.put(c + "List", list);
             }
         } else if (objectType == 2) {
             // 转向级
-            // condition是转向--l r n u
+            // condition是转向--dir:l dir:r dir:n dir:u
             String[] conditions = condition.split(";");
             for (String c : conditions) {
                 List<CrossStatusDistributionVO> list = getCrossStatusDistribution_SingleCondition(crossID, date, groupType, objectType, c);
-                resultMap.put(c + "_list", list);
+                String[] cs = c.split(":");
+                String namePart1 = BaseEnum.SignalDirectionEnum.getNameByCode(Integer.parseInt(cs[0]));
+                String namePart2 = BaseEnum.TurnTypeEnum.getNameByCode(Integer.parseInt(cs[1]));
+                String name = namePart1 + namePart2;
+                resultMap.put(name, list);
             }
         } else if (objectType == 3) {
             // 车道级
-            // condition是车道序号
+            // condition是dir:turn:laneNum
             String[] conditions = condition.split(";");
             for (String c : conditions) {
                 List<CrossStatusDistributionVO> list = getCrossStatusDistribution_SingleCondition(crossID, date, groupType, objectType, c);
-                resultMap.put(c + "_list", list);
+                String[] cs = c.split(":");
+                String namePart1 = BaseEnum.SignalDirectionEnum.getNameByCode(Integer.parseInt(cs[0]));
+                String namePart2 = BaseEnum.TurnTypeEnum.getNameByCode(Integer.parseInt(cs[1]));
+                String namePart3 = cs[2];
+                String name = namePart1 + namePart2 + namePart3;
+                resultMap.put(name, list);
             }
         } else if (objectType == 4) {
             // 路口级
@@ -161,4 +170,5 @@ public class CrossServiceImpl implements CrossService {
 
         return crossBaseInfoVO;
     }
+
 }

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

@@ -9,9 +9,8 @@ import lombok.Data;
 public class CrossTurnInfoEntity {
     @ApiModelProperty(value = "转向")
     private String turn;
-    @ApiModelProperty(value = "转向方向描述")
-    private String turnDirName;
     @ApiModelProperty(value = "方向")
     private String dir;
-
+    @ApiModelProperty(value = "转向方向描述")
+    private String turnDirName;
 }

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

@@ -152,7 +152,7 @@
                                         when 'r' then '右转'
                                         end
                                     )
-                        )            trunDirName
+                        ) turnDirName
         from t_base_cross_turn_info t2
         where 1 = 1
           and t2.cross_id = #{crossID}