From cc55bcfcd193d70cc51ee09ee7a5a413e3ad9e27 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=9B=A8=E6=9C=A8c?= <857448963@qq.com> Date: Tue, 1 Aug 2023 08:44:46 +0800 Subject: [PATCH] =?UTF-8?q?=E6=96=B0=E5=A2=9E=E6=A0=B9=E6=8D=AE=E9=83=A8?= =?UTF-8?q?=E9=97=A8=E8=8E=B7=E5=8F=96=E9=83=A8=E9=97=A8=E4=B8=8B=E7=BA=A7?= =?UTF-8?q?=E7=94=A8=E6=88=B7=E6=8E=A5=E5=8F=A3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../DeviceAbnormaStatisticsServiceImpl.java | 3 +++ .../com/njcn/user/controller/UserController.java | 16 ++++++++++++++++ .../java/com/njcn/user/service/IUserService.java | 7 +++++++ .../njcn/user/service/impl/UserServiceImpl.java | 14 ++++++++++++++ 4 files changed, 40 insertions(+) diff --git a/pqs-prepare/prepare-boot/src/main/java/com/njcn/prepare/harmonic/service/mysql/Impl/device/DeviceAbnormaStatisticsServiceImpl.java b/pqs-prepare/prepare-boot/src/main/java/com/njcn/prepare/harmonic/service/mysql/Impl/device/DeviceAbnormaStatisticsServiceImpl.java index d974aace1..f20c3c396 100644 --- a/pqs-prepare/prepare-boot/src/main/java/com/njcn/prepare/harmonic/service/mysql/Impl/device/DeviceAbnormaStatisticsServiceImpl.java +++ b/pqs-prepare/prepare-boot/src/main/java/com/njcn/prepare/harmonic/service/mysql/Impl/device/DeviceAbnormaStatisticsServiceImpl.java @@ -44,6 +44,9 @@ public class DeviceAbnormaStatisticsServiceImpl implements DeviceAbnormalStatist Map> deviceFlowMap = new HashMap<>(); // 获取所有装置以及下属监测点 List lines = deviceAbnormaStatisticsMapper.getLines(); + if(CollectionUtil.isEmpty(lines)){ + return true; + } // 根据装置id分组 Map> devMap = lines.stream().collect(Collectors.groupingBy(AlarmPO::getDeviceId)); // 监测点集合 diff --git a/pqs-user/user-boot/src/main/java/com/njcn/user/controller/UserController.java b/pqs-user/user-boot/src/main/java/com/njcn/user/controller/UserController.java index eb316229b..ce0b7080e 100644 --- a/pqs-user/user-boot/src/main/java/com/njcn/user/controller/UserController.java +++ b/pqs-user/user-boot/src/main/java/com/njcn/user/controller/UserController.java @@ -391,5 +391,21 @@ public class UserController extends BaseController { List 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> getUserListByDeptId(@RequestParam("deptId") String deptId) { + String methodDescribe = getMethodDescribe("getUserListByDeptId"); + List users = userService.getUserListByDeptId(deptId); + return HttpResultUtil.assembleCommonResponseResult(CommonResponseEnum.SUCCESS, users, methodDescribe); + } } diff --git a/pqs-user/user-boot/src/main/java/com/njcn/user/service/IUserService.java b/pqs-user/user-boot/src/main/java/com/njcn/user/service/IUserService.java index 2b985da7d..2b9d05976 100644 --- a/pqs-user/user-boot/src/main/java/com/njcn/user/service/IUserService.java +++ b/pqs-user/user-boot/src/main/java/com/njcn/user/service/IUserService.java @@ -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 { List getMarketList(); + + + List getUserListByDeptId(String deptId); + + } diff --git a/pqs-user/user-boot/src/main/java/com/njcn/user/service/impl/UserServiceImpl.java b/pqs-user/user-boot/src/main/java/com/njcn/user/service/impl/UserServiceImpl.java index 4c93c4051..ce70081eb 100644 --- a/pqs-user/user-boot/src/main/java/com/njcn/user/service/impl/UserServiceImpl.java +++ b/pqs-user/user-boot/src/main/java/com/njcn/user/service/impl/UserServiceImpl.java @@ -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 implements IU return users; } + @Override + public List getUserListByDeptId(String deptId) { + LambdaQueryWrapper lambdaQueryWrapper = new LambdaQueryWrapper<>(); + lambdaQueryWrapper.like(Dept::getPids,deptId); + List deptIds = new ArrayList<>(); + deptIds.add(deptId); + List deptList = deptService.list(lambdaQueryWrapper); + if(CollectionUtil.isNotEmpty(deptIds)){ + deptIds.addAll(deptList.stream().map(Dept::getId).distinct().collect(Collectors.toList())); + } + return this.list(new LambdaQueryWrapper().in(User::getDeptId,deptIds)); + } + /** * 根据登录名查询用户 *