分享场景列表

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

@@ -6,11 +6,9 @@ import com.fdkankan.manage.common.ResultData;
 import com.fdkankan.manage.controller.BaseController;
 import com.fdkankan.manage.entity.JySceneUserAuth;
 import com.fdkankan.manage.entity.JyUser;
+import com.fdkankan.manage.entity.UserShareParam;
 import com.fdkankan.manage.exception.BusinessException;
-import com.fdkankan.manage.service.IJySceneUserAuthService;
-import com.fdkankan.manage.service.IJyUserService;
-import com.fdkankan.manage.service.IScenePlusService;
-import com.fdkankan.manage.service.IUserService;
+import com.fdkankan.manage.service.*;
 import com.fdkankan.manage.util.RsaUtils;
 import com.fdkankan.manage.vo.request.SceneParam;
 import com.fdkankan.manage.vo.request.UserParam;
@@ -30,6 +28,8 @@ public class InnerAPIController extends BaseController {
     IJySceneUserAuthService jySceneUserAuthService;
     @Autowired
     IScenePlusService scenePlusService;
+    @Autowired
+    IJyUserShareService jyUserShareService;
 
     @PostMapping("/getByRyId")
     public ResultData getByRyId(@RequestBody UserParam param){
@@ -139,6 +139,25 @@ public class InnerAPIController extends BaseController {
         if(StringUtils.isBlank(param.getRyId()) && StringUtils.isBlank(param.getRyNo())){
             throw new BusinessException(ResultCode.MISSING_REQUIRED_PARAMETERS);
         }
-        return ResultData.ok(jySceneUserAuthService.getSceneList(param));
+        JyUser jyUser = null;
+        if(StringUtils.isNotBlank(param.getRyId()) ){
+            jyUser = jyUserService.getByRyId(param.getRyId());
+            if(jyUser == null){
+                throw new BusinessException(ResultCode.JY_ID_NO_EXIST);
+            }
+        }
+        if(StringUtils.isNotBlank(param.getRyNo()) ){
+            jyUser = jyUserService.getByRyNo(param.getRyNo());
+            if(jyUser == null){
+                throw new BusinessException(ResultCode.JY_ID_NO_EXIST);
+            }
+        }
+        if(jyUser == null){
+            throw new BusinessException(ResultCode.JY_ID_NO_EXIST);
+        }
+
+        UserShareParam shareParam = new UserShareParam();
+        shareParam.setJyUserId(jyUser.getId());
+        return ResultData.ok(jyUserShareService.sceneList(shareParam));
     }
 }

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

@@ -42,7 +42,6 @@ public interface IJySceneUserAuthService extends IService<JySceneUserAuth> {
 
     void delByJyUserId(Integer id);
 
-    Object getSceneList(SceneParam param);
 
     HashMap<String, List<JySceneUserAuth>> getByNumList(List<String> numList);
 }

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

@@ -409,69 +409,6 @@ public class JySceneUserAuthServiceImpl extends ServiceImpl<IJySceneUserAuthMapp
     }
 
     @Override
-    public Object getSceneList(SceneParam param) {
-        JyUser jyUser = null;
-        if(StringUtils.isNotBlank(param.getRyId()) ){
-            jyUser = jyUserService.getByRyId(param.getRyId());
-            if(jyUser == null){
-                throw new BusinessException(ResultCode.JY_ID_NO_EXIST);
-            }
-        }
-        if(StringUtils.isNotBlank(param.getRyNo()) ){
-            jyUser = jyUserService.getByRyNo(param.getRyNo());
-            if(jyUser == null){
-                throw new BusinessException(ResultCode.JY_ID_NO_EXIST);
-            }
-        }
-        if(jyUser == null){
-            throw new BusinessException(ResultCode.JY_ID_NO_EXIST);
-        }
-
-        Long userId = jyUser.getUserId();
-        LambdaQueryWrapper<ScenePlus> wrapper = new LambdaQueryWrapper<>();
-        wrapper.eq(ScenePlus::getUserId,userId);
-        Page<ScenePlus> page = scenePlusService.page(new Page<>(param.getPageNum(), param.getPageSize()), wrapper);
-        List<String> numList = page.getRecords().stream().map(ScenePlus::getNum).collect(Collectors.toList());
-
-        HashMap<String,JySceneAuth> sceneAuthMap = jySceneAuthService.getByNumList(numList);
-        HashMap<String,List<JySceneUserAuth>> jySceneUserMap = jySceneUserAuthService.getByNumList(numList);
-        List<Integer> jyUserIds = new ArrayList<>();
-        List<SceneUserAuthVo> voList = new ArrayList<>();
-        for (ScenePlus record : page.getRecords()) {
-            SceneUserAuthVo vo = new SceneUserAuthVo();
-            BeanUtils.copyProperties(record,vo);
-
-            JySceneAuth jySceneAuth = sceneAuthMap.get(record.getNum());
-            if(jySceneAuth != null){
-                vo.setAuthType(jySceneAuth.getAuthType());
-                List<JySceneUserAuth> jySceneUserAuthList = jySceneUserMap.get(record.getNum() + "_" + jySceneAuth.getAuthType());
-                List<Integer> ids = jySceneUserAuthList.stream().map(JySceneUserAuth::getJyUserId).collect(Collectors.toList());
-                jyUserIds.addAll(ids);
-                vo.setAuthList(jySceneUserAuthList);
-            }
-            voList.add(vo);
-        }
-        HashMap<Integer, JyUser> userHashMap = jyUserService.getByIds(jyUserIds);
-
-        for (SceneUserAuthVo sceneUserAuthVo : voList) {
-            List<JySceneUserAuth> authList = sceneUserAuthVo.getAuthList();
-            for (JySceneUserAuth jySceneUserAuth : authList) {
-                JyUser jyUser1 = userHashMap.get(jySceneUserAuth.getJyUserId());
-                if(jyUser1 != null){
-                    jySceneUserAuth.setRyNo(jyUser1.getRyNo());
-                    jySceneUserAuth.setRyNickName(jyUser1.getRyNickName());
-                    jySceneUserAuth.setRyId(jyUser1.getRyId());
-                }
-            }
-        }
-
-        Page<SceneUserAuthVo> pageVo = new Page<>(param.getPageNum(),param.getPageSize());
-        pageVo.setRecords(voList);
-        pageVo.setTotal(page.getTotal());
-        return pageVo;
-    }
-
-    @Override
     public HashMap<String, List<JySceneUserAuth>> getByNumList(List<String> numList) {
         HashMap<String, List<JySceneUserAuth>> map = new HashMap<>();
         if(numList.isEmpty()){