1

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

@@ -2,9 +2,11 @@ package com.fdkankan.manage.controller.inner;
 
 import com.alibaba.fastjson.JSONObject;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.fdkankan.manage.common.PageInfo;
 import com.fdkankan.manage.common.ResultCode;
 import com.fdkankan.manage.common.ResultData;
 import com.fdkankan.manage.controller.BaseController;
+import com.fdkankan.manage.entity.JySceneAuth;
 import com.fdkankan.manage.entity.JySceneUserAuth;
 import com.fdkankan.manage.entity.JyUser;
 import com.fdkankan.manage.entity.UserShareParam;
@@ -15,9 +17,16 @@ import com.fdkankan.manage.vo.request.SceneParam;
 import com.fdkankan.manage.vo.request.UserParam;
 import com.fdkankan.manage.vo.response.UserShareSceneVo;
 import org.apache.commons.lang3.StringUtils;
+import org.elasticsearch.client.indices.IndexTemplatesExistRequest;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
 
+import java.util.ArrayList;
+import java.util.HashMap;
+import java.util.HashSet;
+import java.util.List;
+import java.util.stream.Collectors;
+
 @RestController
 @RequestMapping("/service/manage/inner")
 public class InnerAPIController extends BaseController {
@@ -32,6 +41,8 @@ public class InnerAPIController extends BaseController {
     IScenePlusService scenePlusService;
     @Autowired
     IJyUserShareService jyUserShareService;
+    @Autowired
+    IJySceneAuthService jySceneAuthService;
 
     @PostMapping("/getByRyId")
     public ResultData getByRyId(@RequestBody UserParam param){
@@ -161,9 +172,37 @@ public class InnerAPIController extends BaseController {
         UserShareParam shareParam = new UserShareParam();
         shareParam.setJyUserId(Math.toIntExact(jyUser.getUserId()));
         Page<UserShareSceneVo> page= jyUserShareService.sceneList(shareParam);
-        for (UserShareSceneVo record : page.getRecords()) {
+        List<String> numList = page.getRecords().stream().map(UserShareSceneVo::getNum).collect(Collectors.toList());
+        HashMap<String, JySceneAuth> authMap = jySceneAuthService.getByNumList(numList);
+        HashMap<String, List<JySceneUserAuth>> userSceneAuthMap = jySceneUserAuthService.getByNumList(numList);
+        HashSet<Integer> userIds = new HashSet<>();
+        for (String key : userSceneAuthMap.keySet()) {
+            List<JySceneUserAuth> userAuths = userSceneAuthMap.get(key);
+            for (JySceneUserAuth userAuth : userAuths) {
+                userIds.add(userAuth.getJyUserId());
+            }
+        }
+        HashMap<Integer, JyUser> userHashMap = jyUserService.getByIds(new ArrayList<>(userIds));
 
+        for (UserShareSceneVo record : page.getRecords()) {
+            JySceneAuth jySceneAuth = authMap.get(record.getNum());
+            if(jySceneAuth != null){
+                record.setAuthType(jySceneAuth.getAuthType());
+                List<JySceneUserAuth> userAuths = userSceneAuthMap.get(record.getNum());
+                if(userAuths != null && !userAuths.isEmpty()){
+                    for (JySceneUserAuth userAuth : userAuths) {
+                        JyUser jyUser1 = userHashMap.get(userAuth.getJyUserId());
+                        if(jyUser1 != null){
+                            userAuth.setRyId(jyUser1.getRyId());
+                            userAuth.setRyNo(jyUser1.getRyNo());
+                            userAuth.setRyNickName(jyUser1.getRyNickName());
+                        }
+                    }
+                    record.setAuthList(userAuths);
+                }
+            }
         }
-        return ResultData.ok();
+
+        return ResultData.ok(PageInfo.PageInfo(page));
     }
 }

src/main/java/com/fdkankan/manage/vo/response/UserShareSceneVo.java

@@ -1,7 +1,11 @@
 package com.fdkankan.manage.vo.response;
 
 
+import com.fdkankan.manage.entity.JySceneUserAuth;
 import lombok.Data;
+import org.elasticsearch.client.license.LicensesStatus;
+
+import java.util.List;
 
 @Data
 public class UserShareSceneVo {
@@ -15,4 +19,7 @@ public class UserShareSceneVo {
     private String ryNickName;
     private Integer status;
     private Integer sceneSource;
+
+    private Integer authType;
+    private List<JySceneUserAuth> authList;
 }