Kaynağa Gözat

修改手机端图片替换前缀公共方法。有固定值修改为从运管配置表获取参数进行替换

Wang-Xiao-Ran 1 yıl önce
ebeveyn
işleme
2cfe9967d5

+ 3 - 10
src/main/java/com/sooka/sponest/mobile/appbigdata/controller/AppBigDataController.java

@@ -344,7 +344,7 @@ public class AppBigDataController extends VisuBaseService {
         AjaxResult ajaxResult = remoteDataBaseService.getKeyProjects(deptId);
         if ("200".equals(ajaxResult.get("code").toString())) {
             List<LinkedHashMap<String, Object>> list = (List<LinkedHashMap<String, Object>>) ajaxResult.get("data");
-            PictureReplaceAll.replaceAllPictureUrl(list, "photoId");
+            PictureReplaceAll.replaceAllPictureUrl(list, "photoId", "fileUrl", "appUrl");
         }
         return ajaxResult;
     }
@@ -363,7 +363,7 @@ public class AppBigDataController extends VisuBaseService {
         TableDataInfo keyProjectsByParams = remoteDataBaseService.getKeyProjectsByParams(bo.getPageNum(), bo.getPageSize(), bo.getDeptId(), bo.getPark(), bo.getProjectName(), bo.getTerritoriality(), bo.getNature());
         if (HttpStatus.SUCCESS == keyProjectsByParams.getCode()) {
             List<LinkedHashMap<String, Object>> list = (List<LinkedHashMap<String, Object>>) keyProjectsByParams.getRows();
-            PictureReplaceAll.replaceAllPictureUrl(list, "photoId");
+            PictureReplaceAll.replaceAllPictureUrl(list, "photoId", "fileUrl", "appUrl");
             return AjaxResult.success(list);
         } else {
             return AjaxResult.error(keyProjectsByParams.getMsg());
@@ -376,14 +376,7 @@ public class AppBigDataController extends VisuBaseService {
         AjaxResult ajaxResult = remoteDataBaseService.appGetScheduleByTime(bo.getKeyProjectsId(), bo.getStartTime(), bo.getEndTime());
         if ("200".equals(ajaxResult.get("code").toString())) {
             List<LinkedHashMap<String, Object>> list = (List<LinkedHashMap<String, Object>>) ajaxResult.get("data");
-            PictureReplaceAll.replaceAllPictureUrl(list, "schedulePictures");
-            /*for(int i =0; i < list.size(); i++){
-                LinkedHashMap<String, Object> map = list.get(i);
-                String url = map.containsKey("schedulePictures") ? map.get("schedulePictures").toString().replaceAll("172.18.1.32:8081", "218.27.3.115:9301") : "";
-                url = url.replaceAll("10.6.52.32:8081", "218.27.3.115:9301");
-                map.put("schedulePictures", url);
-                list.set(i, map);
-            }*/
+            PictureReplaceAll.replaceAllPictureUrl(list, "schedulePictures", "fileUrl", "appUrl");
         }
         return ajaxResult;
     }

+ 1 - 1
src/main/java/com/sooka/sponest/mobile/appbigdata/controller/AppBigDataCountController.java

@@ -78,7 +78,7 @@ public class AppBigDataCountController extends VisuBaseService {
         R resultData = middlewareService.getResourcePointById(vb.getId(), vb.getType());
         if (HttpStatus.SUCCESS == resultData.getCode()) {
             LinkedHashMap<String, Object> data = (LinkedHashMap<String, Object>) resultData.getData();
-            return AjaxResult.success(PictureReplaceAll.replaceSchedulePictures(data,"pictures"));
+            return AjaxResult.success(PictureReplaceAll.replaceSchedulePictures(data,"pictures", "fileUrl", "appUrl"));
         } else {
             return AjaxResult.error(resultData.getMsg());
         }

+ 1 - 1
src/main/java/com/sooka/sponest/mobile/system/mainpage/service/impl/AppMainPageServiceImpl.java

@@ -29,7 +29,7 @@ public class AppMainPageServiceImpl implements AppMainPageService {
         AjaxResult ajax = new AjaxResult();
         TableDataInfo info = remoteSystemBaseService.selectList();
         List<LinkedHashMap<String, Object>> list = (List<LinkedHashMap<String, Object>>) info.getRows();
-        PictureReplaceAll.replaceAllPictureUrl(list,"path");
+        PictureReplaceAll.replaceAllPictureUrl(list,"path", "fileUrl", "appUrl");
         ajax.put("total", info.getTotal());
         ajax.put("list", list);
         return AjaxResult.success(ajax);

+ 11 - 14
src/main/java/com/sooka/sponest/mobile/utils/PictureReplaceAll.java

@@ -1,5 +1,8 @@
 package com.sooka.sponest.mobile.utils;
 
+import com.ruoyi.common.core.utils.SpringUtils;
+import com.ruoyi.system.api.RemoteConfigService;
+
 import java.util.*;
 
 /**
@@ -9,25 +12,19 @@ import java.util.*;
  */
 public class PictureReplaceAll {
 
-    private static String OLD_IP_FIRST = "172.18.1.32:8081";
-    private static String OLD_IP_SECOND = "10.6.52.32:8081";
-    private static String NEW_IP = "218.27.3.115:9301";
-
     /**
-     * @description
+     * 替换前缀
      * @author LG
-     * @param[1] null 
-     * @throws 
-     * @Api 替换前缀
-     * @time 2023/8/16 22:52
+     * @Date  2023/8/16 22:52
      */
-    public static void replaceAllPictureUrl(List<LinkedHashMap<String, Object>> list, String replaceKey) {
-        list.replaceAll(map -> replaceSchedulePictures(map, replaceKey));
+    public static void replaceAllPictureUrl(List<LinkedHashMap<String, Object>> list, String replaceKey, String oldIdKey, String newIpKey) {
+        list.replaceAll(map -> replaceSchedulePictures(map, replaceKey, oldIdKey, newIpKey));
     }
 
-    public static LinkedHashMap<String, Object> replaceSchedulePictures(LinkedHashMap<String, Object> map, String replaceKey) {
-        String url = Optional.ofNullable(map.get(replaceKey)).map(Object::toString).map(s -> s.replaceAll(OLD_IP_FIRST, NEW_IP).replaceAll(OLD_IP_SECOND, NEW_IP)).orElse("");
-//        url = url.replaceAll(oldIp2, newIp1);
+    public static LinkedHashMap<String, Object> replaceSchedulePictures(LinkedHashMap<String, Object> map, String replaceKey, String oldIdKey, String newIpKey) {
+        String oldId = SpringUtils.getBean(RemoteConfigService.class).remotegetConfigKey(oldIdKey).getData();
+        String newIp = SpringUtils.getBean(RemoteConfigService.class).remotegetConfigKey(newIpKey).getData();
+        String url = Optional.ofNullable(map.get(replaceKey)).map(Object::toString).map(s -> s.replaceAll(oldId, newIp)).orElse("");
         map.put(replaceKey, url);
         return map;
     }