控制指令接口-测试

signal-utc-service/src/main/java/net/wanji/utc/service/control/impl/HKControlCommandServiceImpl.java

@@ -382,8 +382,6 @@ public class HKControlCommandServiceImpl implements ControlCommandService {
         if (manufacturerInfoPO.getCode().equals(BasicEnum.ManufacturerEnum.HK.getCode())) {
             if (commandVO.getCommand().equals(TRUE)) {
                 Map<String, Object> param = new HashMap<String, Object>() {
-                    private static final long serialVersionUID = 7462850358909460605L;
-
                     {
                         //put("crossCode", commandVO.getCrossCode());
                         put("crossCode", manufacturerInfoPO.getName());
@@ -391,15 +389,25 @@ public class HKControlCommandServiceImpl implements ControlCommandService {
                     }
                 };
                 // 控制命令为灯态锁定时，设置相关车道参数信息
-                // 获取当前运行方案的相位id
                 //List<SignalRunring> runrings = getSignalInfoVos(commandVO.getCrossCode()).get(0).getRunrings();
-                List<SignalRunring> runrings = getSignalInfoVos(manufacturerInfoPO.getName()).get(0).getRunrings();
                 // HK 为单环
-                Integer phaseId = Integer.valueOf(runrings.get(0).getPhaseId());
+                // 获取当前运行方案的相位id
+                LightsStatusVO statusVO = getSignalInfoVos(manufacturerInfoPO.getName()).get(0);
+                Integer phaseId = Integer.valueOf(statusVO.getPhaseId());
                 // 获取某一路口下海康相位和车道关系
                 //Map<Integer, JSONArray> laneArrayMap = getPhaseRelationLanes(commandVO.getCrossCode());
                 Map<Integer, JSONArray> laneArrayMap = getPhaseRelationLanes(manufacturerInfoPO.getName());
-                param.put("laneInfos", laneArrayMap.get(phaseId));
+                JSONArray jsonArray = laneArrayMap.get(phaseId);
+                List<Map<String, Object>> laneList = new ArrayList<>();
+                for (int i = 0; i < jsonArray.size(); i++) {
+                    JSONObject jsonObject = jsonArray.getJSONObject(i);
+                    Map<String, Object> laneMap = new HashMap<>();
+                    laneMap.put("laneNo", jsonObject.getInteger("laneNo"));
+                    laneMap.put("turn", jsonObject.getInteger("turn"));
+                    laneMap.put("direction", jsonObject.getInteger("direction"));
+                    laneList.add(laneMap);
+                }
+                param.put("laneInfos", laneList);
                 param.put("controlNo", 0);
                 // 控制时长，单位 s，0 则持续控制
                 param.put("duration", 0);
@@ -429,7 +437,7 @@ public class HKControlCommandServiceImpl implements ControlCommandService {
      * @throws Exception 异常
      */
     private Map<Integer, JSONArray> getPhaseRelationLanes(String crossCode) throws Exception {
-        Map<String, String> path = PathUtil.getPathMapByApiCode("queryPhaseRlatLanes");
+        Map<String, String> path = PathUtil.getPathMapByApiCode("getPhaseRlatLanes");
         Map<String, String> queryMap = new HashMap<>();
         queryMap.put("crossCode", crossCode);
         String strResult = ArtemisHttpUtil.doPostStringArtemis(artemisConfig, path, null, queryMap,
@@ -459,8 +467,6 @@ public class HKControlCommandServiceImpl implements ControlCommandService {
             if (command.equals(TRUE)) {
 
                 Map<String, Object> param = new HashMap<String, Object>() {
-                    private static final long serialVersionUID = -4365720940762732691L;
-
                     {
                         //put("crossCode", code);
                         put("crossCode", manufacturerInfoPO.getName());
@@ -473,7 +479,7 @@ public class HKControlCommandServiceImpl implements ControlCommandService {
                     //LightsStatusVO lightsStatusVO = getSignalInfoVos(code).get(0);
                     LightsStatusVO lightsStatusVO = getSignalInfoVos(manufacturerInfoPO.getName()).get(0);
                     //暂时按单环处理
-                    String phaseId = lightsStatusVO.getRunrings().get(0).getPhaseId();
+                    String phaseId = lightsStatusVO.getPhaseId();
                     //获取方案数据列表
                     List<CrossPhasePO> baseCrossPhasePlanList = crossPhaseMapper.selectByCrossIdAndPlanId(lightsStatusVO.getCode(), lightsStatusVO.getPhasePlanId());
                     Map<String, List<CrossPhasePO>> groupByPhase = baseCrossPhasePlanList.stream().collect(Collectors.groupingBy(CrossPhasePO::getPhaseNo));
@@ -584,8 +590,6 @@ public class HKControlCommandServiceImpl implements ControlCommandService {
             }
         }
         Map<String, Object> param = new HashMap<String, Object>() {
-            private static final long serialVersionUID = -3468722905882654820L;
-
             {
                 put("crossCode", code);
                 put("controlType", runningMode);

signal-utc-service/src/main/java/net/wanji/utc/vo/PhaseTimingSendVO.java

@@ -54,22 +54,22 @@ public class PhaseTimingSendVO {
         /**
          * 绿闪
          */
-        @ApiModelProperty(value = "绿闪", notes = "")
+        @ApiModelProperty(value = "绿闪", notes = "绿闪")
         private String greenFlash;
         /**
          * 红闪
          */
-        @ApiModelProperty(value = "红闪", notes = "")
+        @ApiModelProperty(value = "红闪", notes = "红闪")
         private String redFlash;
         /**
          * 最小绿
          */
-        @ApiModelProperty(value = "最小绿", notes = "")
+        @ApiModelProperty(value = "最小绿", notes = "最小绿")
         private String minGreen;
         /**
          * 最大绿
          */
-        @ApiModelProperty(value = "最大绿", notes = "")
+        @ApiModelProperty(value = "最大绿", notes = "最大绿")
         private String maxGreen;
         /**
          * 相位关联的车道列表

signal-utc-service/src/main/resources/mapper/CrossPhaseMapper.xml

@@ -51,7 +51,7 @@
     <select id="selectByCrossIdAndPlanId" resultMap="BaseResultMap">
         select
         <include refid="baseColumn"/>
-        from  t_cross_phase where cross_id = #{crossId} and planId = #{planId}
+        from  t_cross_phase where cross_id = #{crossId} and plan_id = #{planId}
     </select>
 
     <select id="selectIdsByPhaseNo" resultType="java.lang.Integer">