Merge remote-tracking branch 'origin/master'

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

@@ -330,9 +330,8 @@ public class RemoteService {
         HashMap<String,String> resultMap=new HashMap<String,String>();
         ResponseEntity<String> forEntity = restTemplate.getForEntity(timerURL + "/cmpt/recordUpload.do?cmptId="+ cmptId + "&records="+records, String.class);
         if (forEntity.getStatusCode() == HttpStatus.OK) {
-            List<RoadStatistic> users = new ArrayList<>();
             String resultString = forEntity.getBody();
-            log.info("报名的信息：" + resultString);
+            log.info("上传成绩的信息：" + resultString);
             /**
              * 返回值:
              * {"message":"00011230001122000000","status":"success"}

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

@@ -969,13 +969,14 @@ public class MicroApiController {
      * @param scoreTime
      * @return
      */
-    @PostMapping(value = "/uploadGpsCheckPointScore/{cmptId}/{markNo}/{checkPointId}/{scoreTime}")
+    @GetMapping(value = "/uploadGpsCheckPointScore/{cmptId}/{markNo}/{checkPointId}/{scoreTime}")
     @ApiResponses({
             @ApiResponse(code = -1, message = "失败"),
             @ApiResponse(code = 200, message = "成功", response = Result.class)})
     @ApiOperation(value = "带经纬度坐标的打卡点上传成绩", notes = "带经纬度坐标的打卡点上传成绩", response = Result.class, tags = "带经纬度坐标的打卡点上传成绩")
     public Result uploadGpsCheckPointScore(@PathVariable("cmptId") int cmptId,@PathVariable("markNo") String markNo,@PathVariable("checkPointId") int checkPointId,@PathVariable("scoreTime") String scoreTime ){
-        String records=markNo+","+scoreTime+",2,"+checkPointId;
+        String records=markNo+","+scoreTime+",1,"+checkPointId;
+        log.info("上传成绩的记录="+records);
         HashMap<String,String> results=remoteService.uploadGpsCheckpointScore(cmptId,records);
 
         if(results.isEmpty()) {