|
@@ -1,12 +1,15 @@
|
|
package com.fdkankan.manage.service.impl;
|
|
package com.fdkankan.manage.service.impl;
|
|
|
|
|
|
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
|
|
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
|
|
|
|
+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.ResultCode;
|
|
import com.fdkankan.manage.entity.*;
|
|
import com.fdkankan.manage.entity.*;
|
|
import com.fdkankan.manage.exception.BusinessException;
|
|
import com.fdkankan.manage.exception.BusinessException;
|
|
import com.fdkankan.manage.mapper.IJySceneUserAuthMapper;
|
|
import com.fdkankan.manage.mapper.IJySceneUserAuthMapper;
|
|
import com.fdkankan.manage.service.*;
|
|
import com.fdkankan.manage.service.*;
|
|
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
|
|
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
|
|
|
|
+import com.fdkankan.manage.vo.request.SceneParam;
|
|
import org.apache.commons.lang3.StringUtils;
|
|
import org.apache.commons.lang3.StringUtils;
|
|
import org.springframework.beans.factory.annotation.Autowired;
|
|
import org.springframework.beans.factory.annotation.Autowired;
|
|
import org.springframework.stereotype.Service;
|
|
import org.springframework.stereotype.Service;
|
|
@@ -36,32 +39,29 @@ public class JySceneUserAuthServiceImpl extends ServiceImpl<IJySceneUserAuthMapp
|
|
IScenePlusService scenePlusService;
|
|
IScenePlusService scenePlusService;
|
|
|
|
|
|
@Override
|
|
@Override
|
|
- public Object getAuthList(String num) {
|
|
|
|
- if(StringUtils.isBlank(num)){
|
|
|
|
|
|
+ public Object getAuthList(SceneParam param) {
|
|
|
|
+ if(StringUtils.isBlank(param.getNum())){
|
|
throw new BusinessException(ResultCode.MISSING_REQUIRED_PARAMETERS);
|
|
throw new BusinessException(ResultCode.MISSING_REQUIRED_PARAMETERS);
|
|
}
|
|
}
|
|
- JySceneAuth jySceneAuth = jySceneAuthService.getByNum(num);
|
|
|
|
|
|
+ JySceneAuth jySceneAuth = jySceneAuthService.getByNum(param.getNum());
|
|
if(jySceneAuth == null){
|
|
if(jySceneAuth == null){
|
|
return new JySceneAuth(0);
|
|
return new JySceneAuth(0);
|
|
}
|
|
}
|
|
|
|
|
|
LambdaQueryWrapper<JySceneUserAuth> wrapper = new LambdaQueryWrapper<>();
|
|
LambdaQueryWrapper<JySceneUserAuth> wrapper = new LambdaQueryWrapper<>();
|
|
- wrapper.eq(JySceneUserAuth::getNum,num);
|
|
|
|
|
|
+ wrapper.eq(JySceneUserAuth::getNum,param.getNum());
|
|
wrapper.orderByDesc(JySceneUserAuth::getCreateTime);
|
|
wrapper.orderByDesc(JySceneUserAuth::getCreateTime);
|
|
- List<JySceneUserAuth> list = this.list(wrapper);
|
|
|
|
- if(list.isEmpty()){
|
|
|
|
- return list;
|
|
|
|
- }
|
|
|
|
- List<Integer> jyUserIds = list.stream().map(JySceneUserAuth::getJyUserId).collect(Collectors.toList());
|
|
|
|
|
|
+ Page<JySceneUserAuth> page = this.page(new Page<>(param.getPageNum(), param.getPageSize()), wrapper);
|
|
|
|
+ List<Integer> jyUserIds = page.getRecords().stream().map(JySceneUserAuth::getJyUserId).collect(Collectors.toList());
|
|
HashMap<Integer, JyUser> map = jyUserService.getByIds(jyUserIds);
|
|
HashMap<Integer, JyUser> map = jyUserService.getByIds(jyUserIds);
|
|
- for (JySceneUserAuth jySceneUserAuth : list) {
|
|
|
|
|
|
+ for (JySceneUserAuth jySceneUserAuth : page.getRecords()) {
|
|
JyUser jyUser = map.get(jySceneUserAuth.getJyUserId());
|
|
JyUser jyUser = map.get(jySceneUserAuth.getJyUserId());
|
|
if(jyUser != null){
|
|
if(jyUser != null){
|
|
jySceneUserAuth.setRyId(jyUser.getRyId());
|
|
jySceneUserAuth.setRyId(jyUser.getRyId());
|
|
jySceneUserAuth.setRyNickName(jyUser.getRyNickName());
|
|
jySceneUserAuth.setRyNickName(jyUser.getRyNickName());
|
|
}
|
|
}
|
|
}
|
|
}
|
|
- jySceneAuth.setUserAuthList(list);
|
|
|
|
|
|
+ jySceneAuth.setUserAuthList(PageInfo.PageInfo(page));
|
|
return jySceneAuth;
|
|
return jySceneAuth;
|
|
}
|
|
}
|
|
|
|
|