From 49c3bb0fc7875bb0c1f231a958fafc6a732fea40 Mon Sep 17 00:00:00 2001
From: baizonghao <1719256278@qq.com>
Date: 星期六, 18 三月 2023 11:21:07 +0800
Subject: [PATCH] 还没改完
---
ycl-common/src/main/java/com/ycl/service/user/impl/UmsAdminServiceImpl.java | 35 +++++++++++++++++++++++++++++++++--
1 files changed, 33 insertions(+), 2 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 d752805..3ba1f4d 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
@@ -8,6 +8,7 @@
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import com.ycl.bo.AdminUserDetails;
import com.ycl.dto.UmsAdminParam;
+import com.ycl.dto.UmsUserDto;
import com.ycl.dto.UpdateAdminPasswordParam;
import com.ycl.entity.user.*;
import com.ycl.exception.ApiException;
@@ -45,6 +46,7 @@
import java.util.ArrayList;
import java.util.Date;
import java.util.List;
+import java.util.function.Function;
import java.util.stream.Collectors;
/**
@@ -98,7 +100,6 @@
@Transactional(rollbackFor = Exception.class)
public UmsAdmin register(UmsAdminParam umsAdminParam) {
UmsAdmin umsAdmin = new UmsAdmin();
- //TODO mac,ip,鑱屽姟锛岀敤鎴风被鍨�
BeanUtils.copyProperties(umsAdminParam, umsAdmin);
umsAdmin.setCreateTime(new Date());
umsAdmin.setStatus(1);
@@ -112,6 +113,13 @@
}
//灏嗗瘑鐮佽繘琛屽姞瀵嗘搷浣�
String encodePassword = passwordEncoder.encode(umsAdmin.getPassword());
+
+ if ( !umsAdmin.getPassword().matches("^(?=.*\\d)(?=.*[a-z])(?=.*[A-Z])[a-zA-Z0-9]{8,16}$")) {
+ Asserts.fail("瀵嗙爜闀垮害8鍒�16浣嶄笖瀵嗙爜涓殑瀛楃蹇呴』鍖呭惈瀛楁瘝锛堝ぇ鍐欐垨鑰呭皬鍐欙級鍜屽繀椤诲寘鍚暟瀛楋紝涓嶈兘鍖呭惈绌烘牸");
+ }
+ if(umsAdmin.getUsername().equals(umsAdmin.getPassword())){
+ Asserts.fail("瀵嗙爜涓嶈兘鍜岀櫥褰曞悕瀹屽叏涓�鑷�");
+ }
umsAdmin.setPassword(encodePassword);
baseMapper.insert(umsAdmin);
@@ -310,7 +318,7 @@
return -1;
}
if(param.getUsername().equals(param.getNewPassword())){
- return -1;
+ return -4;
}
QueryWrapper<UmsAdmin> wrapper = new QueryWrapper<>();
wrapper.lambda().eq(UmsAdmin::getUsername, param.getUsername());
@@ -378,6 +386,27 @@
}
@Override
+ public List<UmsUserDto> userExp() {
+ List<UmsAdmin> umsAdmins = baseMapper.selectList(null);
+ List<UmsUserDto> res = umsAdmins
+ .stream()
+ .map(item -> {
+ UmsUserDto res1 = new UmsUserDto();
+ res1.setId(item.getId());
+ res1.setUsername(item.getUsername());
+ res1.setNickName(item.getNickName());
+ res1.setMobile(item.getMobile());
+ res1.setRoles(item.getRoles());
+ res1.setDepart(item.getDepart());
+ res1.setJobTitle(item.getJobTitle());
+ res1.setCreateTime(item.getCreateTime());
+ res1.setStatus(item.getStatus());
+ return res1;
+ }).collect(Collectors.toList());
+ return res;
+ }
+
+ @Override
public boolean deleteBatch(List<Long> ids) {
boolean success = removeByIds(ids);
getCacheService().delBatchAdmin(ids);
@@ -426,4 +455,6 @@
}
return str;
}
+
+
}
--
Gitblit v1.8.0