1

src/main/java/com/fdkankan/manage/controller/inner/InnerAPIController.java

@@ -238,14 +238,12 @@ public class InnerAPIController extends BaseController {
         if(jyUser == null){
             throw new BusinessException(ResultCode.JY_ID_NO_EXIST);
         }
-        List<JySceneUserAuth> jySceneUserAuths = jySceneUserAuthService.getByJyUserId(jyUser.getId());
-        List<String> numList = jySceneUserAuths.stream().map(JySceneUserAuth::getNum).collect(Collectors.toList());
 
         UserShareParam shareParam = new UserShareParam();
-        shareParam.setNumList(numList);
         shareParam.setPageNum(param.getPageNum());
         shareParam.setPageSize(param.getPageSize());
-        Page<UserShareSceneVo> page= jyUserShareService.sceneList(shareParam);
+        shareParam.setJyUserId(jyUser.getId());
+        Page<UserShareSceneVo> page= jyUserShareService.sceneAuthList(shareParam);
 
         return ResultData.ok(PageInfo.PageInfo(page));
     }

src/main/java/com/fdkankan/manage/mapper/IScenePlusMapper.java

@@ -28,4 +28,5 @@ public interface IScenePlusMapper extends BaseMapper<ScenePlus> {
     List<GroupByCount> getCountGroupByCameraId(@Param("cameraIds") List<Long> cameraIds);
 
     Page<UserShareSceneVo> shareScenePageList(Page<UserShareSceneVo> objectPage, UserShareParam param);
+    Page<UserShareSceneVo> SceneAuthPageList(Page<UserShareSceneVo> objectPage, UserShareParam param);
 }

src/main/java/com/fdkankan/manage/service/IJyUserShareService.java

@@ -26,6 +26,7 @@ public interface IJyUserShareService extends IService<JyUserShare> {
     JyUserShare getByMainUserIdAndUserId(Integer sysUserId, Integer jyUserId);
 
     Page<UserShareSceneVo> sceneList(UserShareParam param);
+    Page<UserShareSceneVo> sceneAuthList(UserShareParam param);
 
     List<JyUserShare> getByJyUserId(Integer id);
 }

src/main/java/com/fdkankan/manage/service/IScenePlusService.java

@@ -31,4 +31,5 @@ public interface IScenePlusService extends IService<ScenePlus> {
     HashMap<Long, Long> getCountGroupByCameraId(ArrayList<Long> longs);
 
     Page<UserShareSceneVo> shareScenePageList(Page<UserShareSceneVo> objectPage, UserShareParam param);
+    Page<UserShareSceneVo> SceneAuthPageList(Page<UserShareSceneVo> objectPage, UserShareParam param);
 }

src/main/java/com/fdkankan/manage/service/impl/JyUserShareServiceImpl.java

@@ -115,10 +115,20 @@ public class JyUserShareServiceImpl extends ServiceImpl<IJyUserShareMapper, JyUs
 
     @Override
     public Page<UserShareSceneVo> sceneList(UserShareParam param) {
+        Page<UserShareSceneVo> page = scenePlusService.shareScenePageList(new Page<>(param.getPageNum(), param.getPageSize()),param);
+        setSsSceneVo(page);
+        return page;
+    }
 
-        HashMap<String,SceneVo> map = new HashMap<>();
-
+    @Override
+    public Page<UserShareSceneVo> sceneAuthList(UserShareParam param) {
         Page<UserShareSceneVo> page = scenePlusService.shareScenePageList(new Page<>(param.getPageNum(), param.getPageSize()),param);
+        setSsSceneVo(page);
+        return page;
+    }
+
+    private void setSsSceneVo(Page<UserShareSceneVo> page) {
+        HashMap<String,SceneVo> map = new HashMap<>();
         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();
@@ -148,6 +158,7 @@ public class JyUserShareServiceImpl extends ServiceImpl<IJyUserShareMapper, JyUs
                 record.setTitle(sceneVo.getSceneName());
             }
         }
-        return page;
     }
+
+
 }

src/main/java/com/fdkankan/manage/service/impl/ScenePlusServiceImpl.java

@@ -79,4 +79,8 @@ public class ScenePlusServiceImpl extends ServiceImpl<IScenePlusMapper, ScenePlu
     public Page<UserShareSceneVo> shareScenePageList(Page<UserShareSceneVo> objectPage, UserShareParam param) {
         return this.getBaseMapper().shareScenePageList(objectPage,param);
     }
+    @Override
+    public Page<UserShareSceneVo> SceneAuthPageList(Page<UserShareSceneVo> objectPage, UserShareParam param) {
+        return this.getBaseMapper().shareScenePageList(objectPage,param);
+    }
 }

src/main/resources/mapper/manage/ScenePlusMapper.xml

@@ -49,4 +49,19 @@
         order by s.create_time desc ,s.id desc
 
     </select>
+
+    <select id="SceneAuthPageList" resultType="com.fdkankan.manage.vo.response.UserShareSceneVo">
+        select s.id,s.title,s.num,s.create_time,s.scene_status as status,s.scene_source,e.web_site,e.algorithm_time,ju.ry_no,ju.ry_nick_name
+        from t_scene_plus s
+        left join  t_scene_plus_ext e on s.id = e.plus_id
+        left join jy_user ju on s.user_id = ju.user_id
+        left join jy_scene_user_auth jua on s.num = jua.num
+        left join jy_scene_auth ja on jua.num = ja.num
+        where s.rec_status = 'A'  and jua.rec_status = 'A'  and jua.auth_type = ja.auth_type
+        <if test="param.jyUserId != null">
+            and jua.user_id = #{param.jyUserId}
+        </if>
+        order by s.create_time desc ,s.id desc
+
+    </select>
 </mapper>