Forráskód Böngészése

feat:新增根据用户真实姓名获取用户对象分页方法
feat:新增预警人员根据真实姓名进行查询

黄渊昊 5 hónapja
szülő
commit
f9f445c071

+ 3 - 0
snowy-plugin/snowy-plugin-coldchain/src/main/java/vip/xiaonuo/coldchain/modular/alarmuser/param/AlarmUserPageParam.java

@@ -52,4 +52,7 @@ public class AlarmUserPageParam {
     @Schema(description = "微信昵称")
     private String nickName;
 
+    @Schema(description = "")
+    private String name;
+
 }

+ 9 - 4
snowy-plugin/snowy-plugin-coldchain/src/main/java/vip/xiaonuo/coldchain/modular/alarmuser/service/impl/AlarmUserServiceImpl.java

@@ -57,10 +57,7 @@ import vip.xiaonuo.sys.modular.user.enums.SysUserStatusEnum;
 import vip.xiaonuo.sys.modular.user.service.SysUserService;
 import vip.xiaonuo.sys.modular.user.service.impl.SysUserServiceImpl;
 
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
-import java.util.Set;
+import java.util.*;
 import java.util.stream.Collectors;
 
 /**
@@ -85,6 +82,14 @@ public class AlarmUserServiceImpl extends ServiceImpl<AlarmUserMapper, AlarmUser
         SaBaseLoginUser loginUser = StpLoginUserUtil.getLoginUser();
         QueryWrapper<AlarmUser> queryWrapper = new QueryWrapper<AlarmUser>().checkSqlInjection();
         queryWrapper.lambda().like(StrUtil.isNotBlank(alarmUserPageParam.getNickName()), AlarmUser::getNickName, alarmUserPageParam.getNickName());
+        if (ObjectUtil.isNotEmpty(alarmUserPageParam.getName())) {
+            Page<SysUser> userPageByName = sysUserService.getUserByName(alarmUserPageParam.getName());
+            if (userPageByName.getTotal() < 1) {
+                return Page.of(userPageByName.getCurrent(), userPageByName.getSize());
+            }
+            List<String> userIds = userPageByName.getRecords().stream().map(SysUser::getId).toList();
+            queryWrapper.lambda().in(AlarmUser::getUserId, userIds);
+        }
         if (ObjectUtil.isAllNotEmpty(alarmUserPageParam.getSortField(), alarmUserPageParam.getSortOrder())) {
             CommonSortOrderEnum.validate(alarmUserPageParam.getSortOrder());
             queryWrapper.orderBy(true, alarmUserPageParam.getSortOrder().equals(CommonSortOrderEnum.ASC.getValue()),

+ 6 - 0
snowy-plugin/snowy-plugin-sys/src/main/java/vip/xiaonuo/sys/modular/user/service/SysUserService.java

@@ -482,4 +482,10 @@ public interface SysUserService extends IService<SysUser> {
     List<SysRole> getRoleListByIdList(SysUserIdListParam sysUserIdListParam);
 
     boolean updateUserOpenId(String account, String openId);
+
+    /**
+     * 根据用户真实姓名获取用户对象
+     * @param name
+     */
+    Page<SysUser> getUserByName(String name);
 }

+ 9 - 0
snowy-plugin/snowy-plugin-sys/src/main/java/vip/xiaonuo/sys/modular/user/service/impl/SysUserServiceImpl.java

@@ -65,6 +65,7 @@ import org.springframework.transaction.annotation.Transactional;
 import org.springframework.web.multipart.MultipartFile;
 import vip.xiaonuo.auth.core.util.StpLoginUserUtil;
 import vip.xiaonuo.common.cache.CommonCacheOperator;
+import vip.xiaonuo.common.enums.CommonDeleteFlagEnum;
 import vip.xiaonuo.common.enums.CommonSortOrderEnum;
 import vip.xiaonuo.common.excel.CommonExcelCustomMergeStrategy;
 import vip.xiaonuo.common.exception.CommonException;
@@ -1586,4 +1587,12 @@ public class SysUserServiceImpl extends ServiceImpl<SysUserMapper, SysUser> impl
         }
         return false;
     }
+
+    @Override
+    public Page<SysUser> getUserByName(String name) {
+        LambdaQueryWrapper<SysUser> queryWrapper = new LambdaQueryWrapper<>();
+        queryWrapper.like(SysUser::getName, name).eq(SysUser::getDeleteFlag, CommonDeleteFlagEnum.NOT_DELETE)
+                .eq(SysUser::getUserStatus, "ENABLE");
+        return this.page(CommonPageRequest.defaultPage(), queryWrapper);
+    }
 }