自动提交代码

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

@@ -71,9 +71,10 @@ public class RoadsGpsCheckpointController {
      */
     @RequestMapping("getGpsCheckPointByRoadId/{cmptId}/{roadId}")
     @ResponseBody
-    public  Result getGpsCheckPointByRoadId(@PathVariable("cmptId") Integer cmptId,@PathVariable("roadId") Integer roadId){
-        RoadGpsPoint roadGpsPoint=roadService.getGps(roadId);
-        String points=roadGpsPoint.getPoints();
+    public  Result getGpsCheckPointByRoadId(@PathVariable("cmptId") Integer cmptId,@PathVariable("roadId") Integer roadId) {
+        RoadGpsPoint roadGpsPoint = roadService.getGps(roadId);
+        if(roadGpsPoint == null) return Result.fail().setMsg("未设置轨迹");
+        String points = roadGpsPoint.getPoints();
         List<RoadsGpsCheckpointMap> roadsGpsCheckpointMapList = new ArrayList<>();
         JSONObject object = JSONObject.parseObject(points);
         JSONArray result = object.getJSONArray("placeMark");
@@ -82,8 +83,8 @@ public class RoadsGpsCheckpointController {
             RoadsGpsCheckpointMap roadsGpsCheckpointMap = new RoadsGpsCheckpointMap();
             JSONObject o = (JSONObject) result.get(i);
             String checkpointGpsName = o.getString("name");
-            String checkpointLatitude=o.getString("latitude");
-            String checkpointLongitude=o.getString("longitude");
+            String checkpointLatitude = o.getString("latitude");
+            String checkpointLongitude = o.getString("longitude");
             roadsGpsCheckpointMap.setCmptId(cmptId).setRoadId(roadId).setCheckpointGpsName(checkpointGpsName).setCheckpointLatitude(checkpointLatitude).setCheckpointLongitude(checkpointLongitude);
             roadsGpsCheckpointMapList.add(roadsGpsCheckpointMap);
         }

src/main/webapp/WEB-INF/views/cmpt/autoscore.jsp

@@ -203,7 +203,7 @@
                 </table>
             </div>
         </div>
-        <div style="display: flex;justify-content: center; margin: 60px;">事
+        <div style="display: flex;justify-content: center; margin: 60px;">
             <span class=" save-btn">保存</span>
         </div>
 
@@ -211,7 +211,7 @@
 
 <script src="${ctxStatic}/newdermon/vendor/popper.js/umd/popper.min.js"></script>
 <script src="${ctxStatic}/js/qikoo.js"></script>
-<script src="${ctxStatic}/js/autoscore.js?<%=System.currentTimeMillis()%>"></script>
+<script src="${ctxStatic}/js/autoscore.js"></script>
 
 </body>
 

src/main/webapp/static/js/autoscore.js

 $(document).ready(function () {
     //切换项目，获取不同计时的打卡点
-    getTimeCp(21177);
+    var roadId = $('.road-name').first().attr('road-id');
+    getTimeCp(roadId);
     //获取gpx路线上的打卡点
 
     //初始化已经配置好的GPS计时点配置列表