报警回放修改

vehicle-sdk/src/main/java/com/ozs/controller/upload/GeoHazardMonitorTokenController.java

@@ -4,6 +4,7 @@ import com.alibaba.fastjson2.JSON;
 import com.alibaba.fastjson2.JSONObject;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.ozs.common.core.domain.AjaxResult;
 import com.ozs.common.core.domain.entity.SysDictData;
 import com.ozs.common.core.redis.RedisCache;
 import com.ozs.common.utils.ApiTokenUtils;
@@ -1959,18 +1960,18 @@ public class GeoHazardMonitorTokenController {
      * @return
      */
     @PostMapping("/api/addRouteMassage")
-    public String addRouteMassage(@RequestBody BaseRouteMassage baseRouteMassage) {
+    public AjaxResult addRouteMassage(@RequestBody BaseRouteMassage baseRouteMassage) {
         if (!ObjectUtils.isEmpty(baseRouteMassage) && !ObjectUtils.isEmpty(baseRouteMassage.getStationCode())) {
             BaseRouteMassage one = baseRouteMassageService.getOne(new LambdaQueryWrapper<BaseRouteMassage>().eq(BaseRouteMassage::getStationCode, baseRouteMassage.getStationCode()));
             if (!ObjectUtils.isEmpty(one)) {
-                return "车站编码已存在！";
+                return AjaxResult.error("车站信息已存在");
             }
         }
         baseRouteMassage.setCreateTime(new Date());
         baseRouteMassage.setStationName("博野站");
         baseRouteMassage.setMileagePosition(11111);
         baseRouteMassageService.save(baseRouteMassage);
-        return "200";
+        return AjaxResult.success();
     }
 
     /**
@@ -1979,13 +1980,15 @@ public class GeoHazardMonitorTokenController {
      * @return
      */
     @GetMapping("/api/getRouteMassageList")
-    public List<BaseRouteMassage> getRouteMassageList() {
+    public AjaxResult getRouteMassageList() {
         List<BaseRouteMassage> list = baseRouteMassageService.list();
         for (BaseRouteMassage baseRouteMassage : list) {
-            String mils = AppendUtils.stringAppend(baseRouteMassage.getMileagePosition());
-            baseRouteMassage.setMileagePositionName(mils);
+            if (!ObjectUtils.isEmpty(baseRouteMassage.getMileagePosition())) {
+                String mils = AppendUtils.stringAppend(baseRouteMassage.getMileagePosition());
+                baseRouteMassage.setMileagePositionName(mils);
+            }
         }
-        return list;
+        return AjaxResult.success(list);
     }
 
     /**
@@ -1994,12 +1997,12 @@ public class GeoHazardMonitorTokenController {
      * @return
      */
     @PostMapping("/api/deleteRouteMassage")
-    public String deleteRouteMassage(@RequestBody BaseRouteMassage baseRouteMassage) {
+    public AjaxResult deleteRouteMassage(@RequestBody BaseRouteMassage baseRouteMassage) {
         if (!ObjectUtils.isEmpty(baseRouteMassage) && !ObjectUtils.isEmpty(baseRouteMassage.getId())) {
             baseRouteMassageService.removeById(baseRouteMassage.getId());
-            return "200";
+            return AjaxResult.success();
         } else {
-            return "ID不存在";
+            return AjaxResult.error("ID不存在");
         }
     }