From 18a6858dfbcf4a09bc0d76175c9aa85e1f36b151 Mon Sep 17 00:00:00 2001 From: yangwei <867012372@qq.com> Date: Thu, 8 May 2025 16:12:23 +0800 Subject: [PATCH] =?UTF-8?q?[feat]=201=E3=80=81=E4=BF=AE=E6=94=B9=E8=AE=BE?= =?UTF-8?q?=E5=A4=87=E7=BB=84=E7=AE=A1=E7=90=86=E7=9B=B8=E5=85=B3=E9=97=AE?= =?UTF-8?q?=E9=A2=98=E2=91=A1?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../controller/DeviceProController.java | 37 +++---- .../sample/manage/model/dto/DeviceProDTO.java | 4 +- .../manage/service/IDeviceProService.java | 3 + .../service/impl/DeviceProServiceImpl.java | 22 ++++- .../resources/mapper/IDeviceProMapper.xml | 20 +--- .../controller/system/SysUserController.java | 10 ++ .../system/domain/vo/SysUserProVo.java | 99 +++++++++++++++++++ .../dromara/system/mapper/SysUserMapper.java | 3 + .../system/service/ISysUserService.java | 2 + .../service/impl/SysUserServiceImpl.java | 5 + .../resources/mapper/system/SysUserMapper.xml | 16 +++ 11 files changed, 174 insertions(+), 47 deletions(-) create mode 100644 dk-modules/system/src/main/java/org/dromara/system/domain/vo/SysUserProVo.java diff --git a/dk-modules/sample/src/main/java/org/dromara/sample/manage/controller/DeviceProController.java b/dk-modules/sample/src/main/java/org/dromara/sample/manage/controller/DeviceProController.java index 8825a83..7cae641 100644 --- a/dk-modules/sample/src/main/java/org/dromara/sample/manage/controller/DeviceProController.java +++ b/dk-modules/sample/src/main/java/org/dromara/sample/manage/controller/DeviceProController.java @@ -95,7 +95,7 @@ public class DeviceProController { @Operation(summary = "查询项目人员。", description = "查询项目人员") @GetMapping("/{proId}/user/page") public HttpResultResponse> pageProUser(@PathVariable Integer proId, - @RequestParam("searchValue") String searchValue, + @RequestParam(value = "searchValue",required = false) String searchValue, @RequestParam(name = "pageNum", defaultValue = "1") Long page, @RequestParam(name = "pageSize", defaultValue = "10") Long pageSize) { Page pageQuery = new Page<>(page, pageSize); @@ -109,14 +109,6 @@ public class DeviceProController { return HttpResultResponse.success(deviceProService.deleteProUser(proUserId,proId)); } - /** - * 设备绑定项目组 - */ - @Operation(summary = "设备绑定项目组", description = "设备绑定项目组") - @PostMapping("/bind") - public HttpResultResponse updateDevice(@RequestBody Dict dict) { - return HttpResultResponse.success(deviceProService.updateDevice(dict)); - } /** * 开启配置 @@ -141,25 +133,20 @@ public class DeviceProController { } /** - * 根据人员获取项目组(feign调用接口) + * 根据人员获取项目组 */ - @GetMapping("/list/pro") - public HttpResultResponse> listDeviceGroup(@RequestParam("userId") Long userId) { - log.info("----------------------------开始调用feign接口查询项目组----------------------------"); - List result = deviceProService.listDeviceGroup(userId); - log.info("----------------------------调用feign接口查询项目组结束----------------------------"); - return HttpResultResponse.success(result); - } +// @GetMapping("/list/pro") +// public HttpResultResponse> listDeviceGroup(@RequestParam("userId") Long userId) { +// List result = deviceProService.listDeviceGroup(userId); +// return HttpResultResponse.success(result); +// } /** - * 根据人员获取当前人员所拥有的机场(feign调用接口) + * 根据人员获取项目组 */ - @GetMapping("/feign/device") - public List listDevice(@RequestParam("userId") Long userId) { - log.info("----------------------------开始调用feign接口查询项目所属机场----------------------------"); - List result = deviceProService.listDevice(userId); - log.info("----------------------------调用feign接口查询项目组所属机场----------------------------"); - return result; + @GetMapping("/list/user/pro") + public HttpResultResponse> listUserGroup() { + List result = deviceProService.listUserGroup(); + return HttpResultResponse.success(result); } - } diff --git a/dk-modules/sample/src/main/java/org/dromara/sample/manage/model/dto/DeviceProDTO.java b/dk-modules/sample/src/main/java/org/dromara/sample/manage/model/dto/DeviceProDTO.java index 578025f..35d9c7e 100644 --- a/dk-modules/sample/src/main/java/org/dromara/sample/manage/model/dto/DeviceProDTO.java +++ b/dk-modules/sample/src/main/java/org/dromara/sample/manage/model/dto/DeviceProDTO.java @@ -48,10 +48,10 @@ public class DeviceProDTO { /** * 设备组编码 */ - private String bindCode; + private String bind_code; /** * 设备组名称 */ - private String proName; + private String pro_name; } diff --git a/dk-modules/sample/src/main/java/org/dromara/sample/manage/service/IDeviceProService.java b/dk-modules/sample/src/main/java/org/dromara/sample/manage/service/IDeviceProService.java index b091787..6e6c321 100644 --- a/dk-modules/sample/src/main/java/org/dromara/sample/manage/service/IDeviceProService.java +++ b/dk-modules/sample/src/main/java/org/dromara/sample/manage/service/IDeviceProService.java @@ -53,4 +53,7 @@ public interface IDeviceProService { PaginationData pageProUser(String searchValue, Integer proId,Page pageQuery); Boolean deleteProUser(Long proUserId, Integer proId); + + List listUserGroup(); + } diff --git a/dk-modules/sample/src/main/java/org/dromara/sample/manage/service/impl/DeviceProServiceImpl.java b/dk-modules/sample/src/main/java/org/dromara/sample/manage/service/impl/DeviceProServiceImpl.java index 0e82616..2ad74d9 100644 --- a/dk-modules/sample/src/main/java/org/dromara/sample/manage/service/impl/DeviceProServiceImpl.java +++ b/dk-modules/sample/src/main/java/org/dromara/sample/manage/service/impl/DeviceProServiceImpl.java @@ -129,10 +129,6 @@ public class DeviceProServiceImpl implements IDeviceProService { @Transactional(rollbackFor = Exception.class) public Boolean updateDeviceProUser(List userEntity,Integer proId) { try { - userEntity.forEach(deviceProUserEntity -> { - deviceProUserEntity.setNickName(LoginHelper.getLoginUser().getNickname()); - deviceProUserEntity.setDeptName(LoginHelper.getDeptName()); - }); //添加新的项目组成员 deviceProUserMapper.insert(userEntity); return true; @@ -261,6 +257,24 @@ public class DeviceProServiceImpl implements IDeviceProService { return deviceProUserMapper.delete(wrapper) > 0; } + @Override + public List listUserGroup() { + Long userId = LoginHelper.getUserId(); + LambdaQueryWrapper wrapper = new LambdaQueryWrapper<>(); + wrapper.eq(DeviceProUserEntity::getUserId,userId); + List proUserEntityList = deviceProUserMapper.selectList(wrapper); + if (ObjectUtil.isNotEmpty(proUserEntityList)){ + List proIdList = proUserEntityList.stream().map(DeviceProUserEntity::getDeviceProId).distinct().toList(); + LambdaQueryWrapper queryWrapper = new LambdaQueryWrapper<>(); + queryWrapper.in(DeviceProEntity::getId, proIdList); + //查询是否启用的设备组 + queryWrapper.eq(DeviceProEntity::getBindType,1); + return deviceProMapper.selectList(queryWrapper); + } + + return ListUtil.empty(); + } + @Override public Boolean saveAndUpdate(DeviceProEntity entity) { boolean flag = true; diff --git a/dk-modules/sample/src/main/resources/mapper/IDeviceProMapper.xml b/dk-modules/sample/src/main/resources/mapper/IDeviceProMapper.xml index 543270f..d685b89 100644 --- a/dk-modules/sample/src/main/resources/mapper/IDeviceProMapper.xml +++ b/dk-modules/sample/src/main/resources/mapper/IDeviceProMapper.xml @@ -56,23 +56,11 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" LEFT JOIN manage_device d ON dp.id = d.pro_id LEFT JOIN manage_device_pro_user dpu ON dp.id = dpu.device_pro_id - - and d.device_sn like concat(concat('%',#{condition.deviceSn}),'%') + + and dp.bind_code like concat(concat('%',#{condition.bind_code}),'%') - - and d.device_name like concat(concat('%',#{condition.deviceName}),'%') - - - and dpu.nickname like concat(concat('%',#{condition.nickname}),'%') - - - and dpu.user_id = #{condition.userId} - - - and dp.bind_code like concat(concat('%',#{condition.bindCode}),'%') - - - and dp.pro_name like concat(concat('%',#{condition.proName}),'%') + + and dp.pro_name like concat(concat('%',#{condition.pro_name}),'%') diff --git a/dk-modules/system/src/main/java/org/dromara/system/controller/system/SysUserController.java b/dk-modules/system/src/main/java/org/dromara/system/controller/system/SysUserController.java index f063cc8..89c13d4 100644 --- a/dk-modules/system/src/main/java/org/dromara/system/controller/system/SysUserController.java +++ b/dk-modules/system/src/main/java/org/dromara/system/controller/system/SysUserController.java @@ -64,6 +64,16 @@ public class SysUserController extends BaseController { return userService.selectPageUserList(user, pageQuery); } + /** + * 查询全部用户不分页 + * @param user + * @return + */ + @GetMapping("/all/list") + public R> allList(SysUserBo user) { + return R.ok(userService.allList(user)); + } + /** * 导出用户列表 */ diff --git a/dk-modules/system/src/main/java/org/dromara/system/domain/vo/SysUserProVo.java b/dk-modules/system/src/main/java/org/dromara/system/domain/vo/SysUserProVo.java new file mode 100644 index 0000000..ae7c0b4 --- /dev/null +++ b/dk-modules/system/src/main/java/org/dromara/system/domain/vo/SysUserProVo.java @@ -0,0 +1,99 @@ +package org.dromara.system.domain.vo; + +import com.fasterxml.jackson.annotation.JsonIgnore; +import com.fasterxml.jackson.annotation.JsonProperty; +import io.github.linpeilie.annotations.AutoMapper; +import lombok.Data; +import org.dromara.common.sensitive.annotation.Sensitive; +import org.dromara.common.sensitive.core.SensitiveStrategy; +import org.dromara.common.translation.annotation.Translation; +import org.dromara.common.translation.constant.TransConstant; +import org.dromara.system.domain.SysUser; + +import java.io.Serial; +import java.io.Serializable; +import java.util.Date; +import java.util.List; + + +/** + * 用户信息视图对象 sys_user + * + * @author Michelle.Chung + */ +@Data +public class SysUserProVo implements Serializable { + + @Serial + private static final long serialVersionUID = 1L; + + /** + * 用户ID + */ + private Long userId; + + /** + * 租户ID + */ + private String tenantId; + + /** + * 部门ID + */ + private Long deptId; + + /** + * 用户账号 + */ + private String userName; + + /** + * 用户昵称 + */ + private String nickName; + + /** + * 用户类型（sys_user系统用户） + */ + private String userType; + + + /** + * 手机号码 + */ + private String phonenumber; + + /** + * 用户性别（0男 1女 2未知） + */ + private String sex; + + + /** + * 帐号状态（0正常 1停用） + */ + private String status; + + + /** + * 备注 + */ + private String remark; + + /** + * 创建时间 + */ + private Date createTime; + + /** + * 部门名 + */ + private String deptName; + + + /** + * 平台名称 + */ + private String productName; + +} diff --git a/dk-modules/system/src/main/java/org/dromara/system/mapper/SysUserMapper.java b/dk-modules/system/src/main/java/org/dromara/system/mapper/SysUserMapper.java index 18b4813..c3dd489 100644 --- a/dk-modules/system/src/main/java/org/dromara/system/mapper/SysUserMapper.java +++ b/dk-modules/system/src/main/java/org/dromara/system/mapper/SysUserMapper.java @@ -9,6 +9,7 @@ import org.dromara.common.mybatis.annotation.DataColumn; import org.dromara.common.mybatis.annotation.DataPermission; import org.dromara.common.mybatis.core.mapper.BaseMapperPlus; import org.dromara.system.domain.SysUser; +import org.dromara.system.domain.bo.SysUserBo; import org.dromara.system.domain.vo.SysUserExportVo; import org.dromara.system.domain.vo.SysUserVo; @@ -92,4 +93,6 @@ public interface SysUserMapper extends BaseMapperPlus { int updateById(@Param(Constants.ENTITY) SysUser user); List selectFlwByIds(@Param(Constants.WRAPPER) Wrapper queryWrapper); + + List allList(@Param("param") SysUserBo user); } diff --git a/dk-modules/system/src/main/java/org/dromara/system/service/ISysUserService.java b/dk-modules/system/src/main/java/org/dromara/system/service/ISysUserService.java index ed56653..8f5e0d6 100644 --- a/dk-modules/system/src/main/java/org/dromara/system/service/ISysUserService.java +++ b/dk-modules/system/src/main/java/org/dromara/system/service/ISysUserService.java @@ -273,4 +273,6 @@ public interface ISysUserService { List assignUserSelect(Long deptId); List selectFlwByIds(List userIds, Long deptId); + + List allList(SysUserBo user); } diff --git a/dk-modules/system/src/main/java/org/dromara/system/service/impl/SysUserServiceImpl.java b/dk-modules/system/src/main/java/org/dromara/system/service/impl/SysUserServiceImpl.java index 0a151b9..aae5b7b 100644 --- a/dk-modules/system/src/main/java/org/dromara/system/service/impl/SysUserServiceImpl.java +++ b/dk-modules/system/src/main/java/org/dromara/system/service/impl/SysUserServiceImpl.java @@ -584,6 +584,11 @@ public class SysUserServiceImpl implements ISysUserService { .in(CollUtil.isNotEmpty(userIds), SysUser::getUserId, userIds)); } + @Override + public List allList(SysUserBo user) { + return baseMapper.allList(user); + } + /** * 通过用户ID查询用户账户 * diff --git a/dk-modules/system/src/main/resources/mapper/system/SysUserMapper.xml b/dk-modules/system/src/main/resources/mapper/system/SysUserMapper.xml index 93513f2..40e2a67 100644 --- a/dk-modules/system/src/main/resources/mapper/system/SysUserMapper.xml +++ b/dk-modules/system/src/main/resources/mapper/system/SysUserMapper.xml @@ -96,5 +96,21 @@ ${ew.getCustomSqlSegment} + +