Microservice/pqs
5
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases 1 Wiki Activity

新增根据部门获取部门下级用户接口

Browse Source
This commit is contained in:
雨木c
2023-08-01 08:44:46 +08:00
parent 9d20b33fea
commit cc55bcfcd1
4 changed files with 40 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
pqs-prepare/prepare-boot/src/main/java/com/njcn/prepare/harmonic/service/mysql/Impl/device/DeviceAbnormaStatisticsServiceImpl.java
View File

@@ -44,6 +44,9 @@ public class DeviceAbnormaStatisticsServiceImpl implements DeviceAbnormalStatist
Map<String, List<AlarmPO>> deviceFlowMap = new HashMap<>();
// 获取所有装置以及下属监测点
List<AlarmPO> lines = deviceAbnormaStatisticsMapper.getLines();
if(CollectionUtil.isEmpty(lines)){
return true;
}
// 根据装置id分组
Map<String, List<AlarmPO>> devMap = lines.stream().collect(Collectors.groupingBy(AlarmPO::getDeviceId));
// 监测点集合

16
pqs-user/user-boot/src/main/java/com/njcn/user/controller/UserController.java
View File

@@ -391,5 +391,21 @@ public class UserController extends BaseController {
List<User> users = userService.getMarketList();
return HttpResultUtil.assembleCommonResponseResult(CommonResponseEnum.SUCCESS, users, methodDescribe);
}
/**
* 获取同级部门用户，以及下级部门所有用户
* @author cdf
* @date 2023/7/31
*/
@OperateInfo(info = LogEnum.SYSTEM_COMMON)
@PostMapping("/getUserListByDeptId")
@ApiOperation("根据用户id集合查询用户信息")
@ApiImplicitParam(name = "deptId", value = "用户部门id", required = true)
public HttpResult<List<User>> getUserListByDeptId(@RequestParam("deptId") String deptId) {
String methodDescribe = getMethodDescribe("getUserListByDeptId");
List<User> users = userService.getUserListByDeptId(deptId);
return HttpResultUtil.assembleCommonResponseResult(CommonResponseEnum.SUCCESS, users, methodDescribe);
}
}

7
pqs-user/user-boot/src/main/java/com/njcn/user/service/IUserService.java
View File

@@ -2,10 +2,12 @@ package com.njcn.user.service;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.baomidou.mybatisplus.extension.service.IService;
import com.njcn.common.pojo.response.HttpResult;
import com.njcn.user.pojo.param.UserParam;
import com.njcn.user.pojo.po.User;
import com.njcn.user.pojo.dto.UserDTO;
import com.njcn.user.pojo.vo.UserVO;
import org.springframework.web.bind.annotation.RequestParam;
import javax.servlet.http.HttpServletRequest;
import java.util.List;
@@ -171,4 +173,9 @@ public interface IUserService extends IService<User> {
List<User> getMarketList();
List<User> getUserListByDeptId(String deptId);
}

14
pqs-user/user-boot/src/main/java/com/njcn/user/service/impl/UserServiceImpl.java
View File

@@ -6,6 +6,7 @@ import cn.hutool.core.io.FileUtil;
import cn.hutool.core.util.CharUtil;
import cn.hutool.core.util.ObjectUtil;
import cn.hutool.core.util.StrUtil;
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
@@ -470,6 +471,19 @@ public class UserServiceImpl extends ServiceImpl<UserMapper, User> implements IU
return users;
}
@Override
public List<User> getUserListByDeptId(String deptId) {
LambdaQueryWrapper<Dept> lambdaQueryWrapper = new LambdaQueryWrapper<>();
lambdaQueryWrapper.like(Dept::getPids,deptId);
List<String> deptIds = new ArrayList<>();
deptIds.add(deptId);
List<Dept> deptList = deptService.list(lambdaQueryWrapper);
if(CollectionUtil.isNotEmpty(deptIds)){
deptIds.addAll(deptList.stream().map(Dept::getId).distinct().collect(Collectors.toList()));
}
return this.list(new LambdaQueryWrapper<User>().in(User::getDeptId,deptIds));
}
/**
* 根据登录名查询用户
*