拆分详情接口

src/main/java/com/sooka/sponest/mobile/remoteapi/RemoteDataBaseService.java

@@ -605,8 +605,9 @@ public interface RemoteDataBaseService {
      * @author wang_xy
      * @since 2023/2/22 14:34
      */
-    @GetMapping("/attach/attachBFireLogById/{id}")
-    public R<List<AppDataTAttach>> attachBFireLogById(@PathVariable("id") String id);
+//    @GetMapping("/attach/attachBFireLogById/{id}")
+    @GetMapping("/attach/urlAttch/{busId}")
+    public R<List<AppDataTAttach>> attachBFireLogById(@PathVariable("busId") String id);
 
     /**
      * 反馈信息查询涉及接口
@@ -616,8 +617,9 @@ public interface RemoteDataBaseService {
      * @author wang_xy
      * @since 2023/2/22 14:34
      */
-    @GetMapping("/attach/attachBFireLogByIdMp/{id}")
-    public R<List<AppDataTAttach>> attachBFireLogByIdMp(@PathVariable("id") String id);
+//    @GetMapping("/attach/attachBFireLogByIdMp/{id}")
+    @GetMapping("/attach/urlAttchMpF/{busId}")
+    public R<List<AppDataTAttach>> attachBFireLogByIdMp(@PathVariable("busId") String id);
 
     /*********************************************应急接口start**********************************/
 

src/main/java/com/sooka/sponest/mobile/system/camera/controller/AppCameraController.java

@@ -30,7 +30,7 @@ public class AppCameraController extends AppBaseController {
     /**
      * 附近摄像头列表
      *
-     * @return
+     * @return AjaxResult
      * @Version 1.0
      * @author wang_xy
      * @since 2023/2/22 10:47
@@ -257,34 +257,45 @@ public class AppCameraController extends AppBaseController {
     /**
      * 查询视联网详情
      *
-     * @param id   视联网设备ID
-     * @param type 请求的数据类型：1=视联网/2=物联网/3=云广播
+     * @param id 视联网设备ID
      * @return AjaxResult
      */
     @GetMapping("/getCameraById")
-    public AjaxResult getCameraByCameraId(@RequestParam("id") String id, @RequestParam("type") String type) {
-        AjaxResult result;
-        StringBuilder urlType = new StringBuilder();
-        if ("1".equals(type)) {
-            result = remoteMonitorBaseService.selectByCameraId(id);
-            urlType.append("cameraImagesList");
-        } else if ("2".equals(type)) {
-            result = remoteMonitorBaseService.selectByDeviceId(id);
-            urlType.append("deviceImagesList");
-        } else if ("3".equals(type)) {
-            result = remoteMonitorBaseService.selectByBroadcastId(id);
-            urlType.append("broadcastImagesList");
-        } else {
-            return AjaxResult.error("Request type is not found!");
-        }
-        if ("200".equals(result.get("code").toString())) {
-            Map<String, Object> data = (Map<String, Object>) result.get("data");
-            List<LinkedHashMap<String, Object>> dataList = (List<LinkedHashMap<String, Object>>) data.get(urlType.toString());
+    public AjaxResult getCameraByCameraId(@RequestParam("id") String id) {
+        return replacePictures(remoteMonitorBaseService.selectByCameraId(id), "cameraImagesList");
+    }
+
+    /**
+     * 查询物联网详情
+     *
+     * @param id
+     * @return
+     */
+    @GetMapping("getDeviceById")
+    public AjaxResult getDeviceById(@RequestParam("id") String id) {
+        return replacePictures(remoteMonitorBaseService.selectByDeviceId(id), "deviceImagesList");
+    }
+
+    /**
+     * 查询云广播详情
+     *
+     * @param id
+     * @return
+     */
+    @GetMapping("getBroadcastById")
+    public AjaxResult getBroadcastById(@RequestParam("id") String id) {
+        return replacePictures(remoteMonitorBaseService.selectByBroadcastId(id), "broadcastImagesList");
+    }
+
+    private static AjaxResult replacePictures(AjaxResult ajaxResult, String type) {
+        if ("200".equals(ajaxResult.get("code").toString())) {
+            Map<String, Object> data = (Map<String, Object>) ajaxResult.get("data");
+            List<LinkedHashMap<String, Object>> dataList = (List<LinkedHashMap<String, Object>>) data.get(type);
             PictureReplaceAll.replaceAllPictureUrl(dataList, "url");
-            data.put(urlType.toString(), dataList);
+            data.put(type, dataList);
             return AjaxResult.success(data);
         } else {
-            return result;
+            return ajaxResult;
         }
     }
 

src/main/java/com/sooka/sponest/mobile/utils/PictureReplaceAll.java

@@ -1,7 +1,9 @@
 package com.sooka.sponest.mobile.utils;
 
 import com.ruoyi.common.core.utils.SpringUtils;
+import com.ruoyi.common.core.utils.StringUtils;
 import com.ruoyi.system.api.RemoteConfigService;
+import org.apache.commons.collections4.MapUtils;
 
 import java.util.*;
 
@@ -14,8 +16,9 @@ public class PictureReplaceAll {
 
     /**
      * 替换前缀
+     *
      * @author LG
-     * @Date  2023/8/16 22:52
+     * @Date 2023/8/16 22:52
      */
     public static void replaceAllPictureUrl(List<LinkedHashMap<String, Object>> list, String replaceKey) {
         String oldIp = SpringUtils.getBean(RemoteConfigService.class).remotegetConfigKey("fileUrl").getData();
@@ -29,20 +32,22 @@ public class PictureReplaceAll {
         return map;
     }
 
-    public static List<String> replacePicturesList(List<String> picturesList){
+    public static List<String> replacePicturesList(List<String> picturesList) {
         List<String> result = new ArrayList<>();
         String oldIp = SpringUtils.getBean(RemoteConfigService.class).remotegetConfigKey("fileUrl").getData();
         String newIp = SpringUtils.getBean(RemoteConfigService.class).remotegetConfigKey("appUrl").getData();
-        picturesList.forEach(s->{
+        picturesList.forEach(s -> {
             result.add(s.replaceAll(oldIp, newIp));
         });
         return result;
     }
 
-    public static void StringToList(Map<String, Object> info){
-        if(info.containsKey("attachPaths")){
-            info.put("attachPaths", info.get("attachPaths").toString().split(","));
+    public static void StringToList(Map<String, Object> info) {
+        String[] attachPaths = {};
+        if (StringUtils.isNotBlank(MapUtils.getString(info, "attachPaths"))) {
+            attachPaths = MapUtils.getString(info, "attachPaths").split(",");
         }
+        info.put("attachPaths", attachPaths);
 
     }
 }