Merge remote-tracking branch 'origin/master'

src/main/java/com/dlbridge/jadp/plugins/cmpt/service/RemoteService.java

@@ -369,25 +369,52 @@ public class RemoteService {
             String resultString = forEntity.getBody();
             log.info("计时打卡点：" + resultString);
             JSONObject object = JSONObject.parseObject(resultString);
-            JSONArray segsResult = object.getJSONObject("road").getJSONArray("segs");
+            JSONObject roadJsonObject=object.getJSONObject("road");
+            JSONArray segsResult = roadJsonObject.getJSONArray("segs");
             if(segsResult == null || segsResult.isEmpty()) return null;
-            //暂不支持多日赛
-            JSONObject resultObject = (JSONObject)segsResult.get(0);
-            JSONArray result = resultObject.getJSONArray("segCps");
-            if (result == null || result.isEmpty()) return null;
-            //获取每个打卡点的信息
-            for (int i = 0; i < result.size(); i++) {
-                RoadsGpsCheckpointMap roadsGpsCheckpointMap = new RoadsGpsCheckpointMap();
-                JSONObject o = (JSONObject) result.get(i);
-                String checkpointId = o.getString("checkPointId");
-                String checkpointName = o.getString("cpName");
-                String checkpointDistance=o.getString("distance");
-                roadsGpsCheckpointMap.setCmptId(cmptId).setRoadId(roadId).setCheckpointId(Integer.parseInt(checkpointId)).setCheckpointName(checkpointName).setCheckpointDistance(Double.parseDouble(checkpointDistance));
-                roadsGpsCheckpointMapList.add(roadsGpsCheckpointMap);
+            //支持多日赛
+            for(int j=0;j<segsResult.size();j++) {
+                JSONObject resultObject = (JSONObject) segsResult.get(j);
+                JSONArray result = resultObject.getJSONArray("segCps");
+                if (result == null || result.isEmpty()) return null;
+                //获取每个打卡点的信息
+                for (int i = 0; i < result.size(); i++) {
+                    RoadsGpsCheckpointMap roadsGpsCheckpointMap = new RoadsGpsCheckpointMap();
+                    JSONObject o = (JSONObject) result.get(i);
+                    String checkpointId = o.getString("checkPointId");
+                    String checkpointName = o.getString("cpName");
+                    String checkpointDistance = o.getString("distance");
+                    roadsGpsCheckpointMap.setCmptId(cmptId).setRoadId(roadId).setCheckpointId(Integer.parseInt(checkpointId)).setCheckpointName(checkpointName).setCheckpointDistance(Double.parseDouble(checkpointDistance));
+                    roadsGpsCheckpointMapList.add(roadsGpsCheckpointMap);
+                }
             }
             return roadsGpsCheckpointMapList;
         } else {
             return null;
         }
     }
+    /**
+     * 根据赛事Id，项目Id获取队员参赛项目的开始时间和结束时间
+     * @param cmptId
+     * @return
+     */
+    public HashMap<String,Long> getRoadOpenTimeAndCloseTime(Integer cmptId,Integer roadId) {
+        ResponseEntity<String> forEntity = restTemplate.getForEntity(timerURL + "getRoad.do?cmptId="+ cmptId + "&roadId="+roadId, String.class);
+        HashMap<String,Long> segsResult=new HashMap<String,Long>();
+        if (forEntity.getStatusCode() == HttpStatus.OK) {
+            String resultString = forEntity.getBody();
+            JSONObject object = JSONObject.parseObject(resultString);
+            JSONObject roadJsonObject=object.getJSONObject("road");
+            long srtartTime=roadJsonObject.getLong("startTimeMs70");
+            long endTime=roadJsonObject.getLong("endTimeMs70");
+            segsResult.put("srtartTime",srtartTime);
+            segsResult.put("endTime",endTime);
+            return segsResult;
+        } else {
+            return null;
+        }
+    }
+
+
+
 }

src/main/java/com/dlbridge/jadp/plugins/cmpt/web/MicroApiController.java

@@ -991,4 +991,15 @@ public class MicroApiController {
         return Result.fail().setContent(results);
     }
 
+
+    @GetMapping(value = "/getRoadOpenTimeAndCloseTime/{cmptId}/{roadId}")
+    @ApiResponses({
+            @ApiResponse(code = -1, message = "失败", response = ObjectUtils.Null.class),
+            @ApiResponse(code = 200, message = "成功", response = Result.class, responseContainer = "List")})
+    @ApiOperation(value = "自动打卡获取开枪时间或者结束时间", notes = "自动打卡获取开枪时间或者结束时间",  tags = "自动打卡获取开枪时间或者结束时间")
+    public Result getRoadOpenTimeAndCloseTime(@PathVariable("cmptId") int cmptId,@PathVariable("roadId") int roadId){
+        HashMap<String,Long> roadsGpsCheckpointMapList=remoteService.getRoadOpenTimeAndCloseTime(cmptId,roadId);
+        return Result.success().setContent(roadsGpsCheckpointMapList);
+    }
+
 }