lyhzzz 1 год назад
Родитель
Сommit
7c34564814

+ 26 - 2
src/main/java/com/fdkankan/manage/service/impl/JyUserShareServiceImpl.java

@@ -17,6 +17,8 @@ import com.fdkankan.manage.service.IJyUserShareService;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.fdkankan.manage.service.IScenePlusService;
 import com.fdkankan.manage.service.IUserService;
+import com.fdkankan.manage.vo.request.SceneParam;
+import com.fdkankan.manage.vo.response.SceneVo;
 import com.fdkankan.manage.vo.response.UserShareSceneVo;
 import com.fdkankan.manage.vo.response.UserShareVo;
 import org.apache.commons.lang3.StringUtils;
@@ -107,10 +109,32 @@ public class JyUserShareServiceImpl extends ServiceImpl<IJyUserShareMapper, JyUs
             throw new BusinessException(ResultCode.MISSING_REQUIRED_PARAMETERS);
         }
         Page<UserShareSceneVo> page = scenePlusService.shareScenePageList(new Page<>(param.getPageNum(), param.getPageSize()),param);
-        List<String> ssNumList = page.getRecords().stream().filter(e -> e.getSceneSource().equals(4) || e.getSceneSource().equals(5)).map(UserShareSceneVo::getNum).collect(Collectors.toList());
+        List<String> ssNumList = page.getRecords().stream().filter(e -> e.getSceneSource().equals(4)).map(UserShareSceneVo::getNum).collect(Collectors.toList());
+        List<String> sgNumList = page.getRecords().stream().filter(e -> e.getSceneSource().equals(5)).map(UserShareSceneVo::getNum).collect(Collectors.toList());
+        SceneParam laserParam = new SceneParam();
+        laserParam.setPageNum(1);
+        laserParam.setPageSize(999);
+        laserParam.setAuthNumList(ssNumList);
+        laserParam.setType(2);
+        Page<SceneVo> sceneVoPage = laserService.pageList(laserParam);
+        laserParam.setType(6);
+        laserParam.setAuthNumList(sgNumList);
+        Page<SceneVo> sceneVoPage2 = laserService.pageList(laserParam);
+        HashMap<String,SceneVo> map = new HashMap<>();
+        for (SceneVo sceneVo : sceneVoPage.getRecords()) {
+            map.put(sceneVo.getNum(),sceneVo);
+        }
+        for (SceneVo sceneVo : sceneVoPage2.getRecords()) {
+            map.put(sceneVo.getNum(),sceneVo);
+        }
+
         for (UserShareSceneVo record : page.getRecords()) {
             //替换深时标题,链接
-            record.getSceneSource();
+            SceneVo sceneVo = map.get(record.getNum());
+            if(sceneVo != null){
+                record.setWebSite(sceneVo.getWebSite());
+                record.setTitle(sceneVo.getSceneName());
+            }
         }
         return PageInfo.PageInfo(page);
     }