From fd071f321fb967f36cf795fc40b4f2e87e89e69d Mon Sep 17 00:00:00 2001
From: zhanghua <314079846@qq.com>
Date: 星期一, 12 十二月 2022 22:38:24 +0800
Subject: [PATCH] 预警研判
---
ycl-common/src/main/java/com/ycl/service/user/impl/UmsAdminServiceImpl.java | 44 +++++++++++++++++++++++++++++++++-----------
1 files changed, 33 insertions(+), 11 deletions(-)
diff --git a/ycl-common/src/main/java/com/ycl/service/user/impl/UmsAdminServiceImpl.java b/ycl-common/src/main/java/com/ycl/service/user/impl/UmsAdminServiceImpl.java
index 85aa93d..3eb84eb 100644
--- a/ycl-common/src/main/java/com/ycl/service/user/impl/UmsAdminServiceImpl.java
+++ b/ycl-common/src/main/java/com/ycl/service/user/impl/UmsAdminServiceImpl.java
@@ -4,13 +4,11 @@
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.core.metadata.IPage;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import com.ycl.bo.AdminUserDetails;
import com.ycl.dto.UmsAdminParam;
import com.ycl.dto.UpdateAdminPasswordParam;
-import com.ycl.entity.depart.UmsDepart;
import com.ycl.entity.user.*;
import com.ycl.exception.ApiException;
import com.ycl.exception.Asserts;
@@ -80,8 +78,6 @@
AdminMenuRelationMapper adminMenuRelationMapper;
@Resource
UmsMenuMapper umsMenuMapper;
- @Resource
- UmsAdminMapper umsAdminMapper;
@Override
public UmsAdmin getAdminByUsername(String username) {
@@ -141,7 +137,7 @@
}
umsRoleMenuRelations
.stream()
- .map(item->item.getMenuId())
+ .map(item -> item.getMenuId())
.collect(Collectors.toList())
.stream()
.distinct()
@@ -186,7 +182,7 @@
token = jwtTokenUtil.generateToken(userDetails.getUserId(), userDetails.getUsername());
redisService.set(RedisKey.PLATFORM_TOKEN_KEY.concat(username), token, LiveTimeMillisecond.s7200.time);
// updateLoginTimeByUsername(username);
- insertLoginLog(username);
+ //insertLoginLog(username);
} catch (AuthenticationException e) {
LOGGER.warn("鐧诲綍寮傚父:{}", e.getMessage());
}
@@ -301,15 +297,16 @@
return umsMenuList;
}
umsMenuList = umsMenuMapper.getMenuList(adminId);
- getCacheService().setResourceList(adminId, umsMenuList);
+ getCacheService().setResourceList(adminId, umsMenuList);
return umsMenuList;
}
@Override
public int updatePassword(UpdateAdminPasswordParam param) {
- if (StrUtil.isEmpty(param.getUsername())
- || StrUtil.isEmpty(param.getOldPassword())
- || StrUtil.isEmpty(param.getNewPassword())) {
+ if (StrUtil.isNotEmpty(param.getUsername())
+ && StrUtil.isNotEmpty(param.getOldPassword())
+ && StrUtil.isNotEmpty(param.getNewPassword())
+ && !param.getNewPassword().matches("^(?=.*\\d)(?=.*[a-z])(?=.*[A-Z])[a-zA-Z0-9]{6,16}$")) {
return -1;
}
QueryWrapper<UmsAdmin> wrapper = new QueryWrapper<>();
@@ -349,7 +346,32 @@
int pageSize = pageUserVO.getPageSize();
int current = pageUserVO.getCurrent();
Page<UmsAdmin> page = new Page<>(current, pageSize);
- return umsAdminMapper.selectPageByWordKey(page,pageUserVO.getKeyword());
+ /* LambdaQueryWrapper<UmsAdmin> queryWrapper = new LambdaQueryWrapper<>();
+
+ if (StringUtils.isNotBlank(pageUserVO.getKeyword())) {
+ queryWrapper.like(UmsAdmin::getUsername, pageUserVO.getKeyword())
+ .or().like(UmsAdmin::getNickName, pageUserVO.getKeyword())
+ .or().like(UmsAdmin::getMobile, pageUserVO.getKeyword());
+ }
+ if (StringUtils.isNotBlank(pageUserVO.getJobTitle())) {
+ queryWrapper.eq(UmsAdmin::getJobTitle, pageUserVO.getJobTitle());
+ }
+ if (PojoUtils.Vo.isUsefulSearchParam(pageUserVO.getUserType())) {
+ queryWrapper.eq(UmsAdmin::getUserType, pageUserVO.getUserType());
+ }*/
+ UmsAdmin umsAdmin = new UmsAdmin();
+ if (pageUserVO.getUserType() != null) {
+ umsAdmin.setUserType(pageUserVO.getUserType());
+ }
+ if (pageUserVO.getKeyword() != null && !("".equals(pageUserVO.getKeyword()))) {
+ umsAdmin.setKeyword(pageUserVO.getKeyword());
+ }
+ if (pageUserVO.getJobTitle() != null && !("".equals(pageUserVO.getJobTitle()))) {
+ umsAdmin.setJobTitle(pageUserVO.getJobTitle());
+ }
+ Page<UmsAdmin> page1 = baseMapper.selectCondPage(page, umsAdmin);
+
+ return page1;
}
@Override
--
Gitblit v1.8.0