From 1c375d6dcd0c41bc3c206585a2712ec066bf5992 Mon Sep 17 00:00:00 2001
From: lyfO_o <764716047@qq.com>
Date: 星期五, 18 十一月 2022 10:09:13 +0800
Subject: [PATCH] 卡号 bug
---
src/main/java/com/nanometer/smartlab/controller/UserMngController.java | 245 +++++++++++++++++++++++++++++++++++++++---------
1 files changed, 199 insertions(+), 46 deletions(-)
diff --git a/src/main/java/com/nanometer/smartlab/controller/UserMngController.java b/src/main/java/com/nanometer/smartlab/controller/UserMngController.java
index 9ef8dc1..03b33ba 100644
--- a/src/main/java/com/nanometer/smartlab/controller/UserMngController.java
+++ b/src/main/java/com/nanometer/smartlab/controller/UserMngController.java
@@ -10,6 +10,7 @@
import com.nanometer.smartlab.entity.enumtype.Waster;
import com.nanometer.smartlab.service.BaseMetaService;
import com.nanometer.smartlab.service.BaseRoleService;
+import com.nanometer.smartlab.service.SysProjectService;
import com.nanometer.smartlab.service.SysUserService;
import com.nanometer.smartlab.util.Constants;
import com.nanometer.smartlab.util.FacesUtils;
@@ -51,6 +52,8 @@
private BaseMetaService baseMetaService;
@Resource
private BaseRoleService baseRoleService;
+ @Resource
+ private SysProjectService sysProjectService;
private LazyDataModel<SysUser> dataModel;
private SysUser sysUser;
@@ -68,6 +71,9 @@
private List<BaseMeta> codeList;
private List<BaseRole> roleList;
private List<Waster> wasterSelectList;
+ private String project;
+ private String company;
+ private BaseRole role;
public List<BaseRole> getRoleList() {
return roleList;
@@ -97,6 +103,14 @@
public void onNewBtnClick() {
this.sysUser = new SysUser();
+ if (this.selectedList.size() > 1) {
+ FacesUtils.warn("不能多选");
+ return;
+ }
+ if (this.selectedList.size() == 1) {
+ this.sysUser = this.sysUserService.getSysUser(this.selectedList.get(0).getId());
+ this.sysUser.setId(null);
+ }
this.action = Constants.ACTION_ADD;
}
@@ -128,7 +142,7 @@
int totalRows = sheet.getPhysicalNumberOfRows();
List<SysUser> userList=new ArrayList<>();
System.out.println("totalRows=========="+totalRows);
- String errorMsg = null;
+ String errorMsg = "";
for (int i = 1; i < totalRows; i++) {
row=sheet.getRow(i);
@@ -174,29 +188,60 @@
}
valuesList.add(id);
}else if(t==6){
- cellInfo=new BigDecimal(""+cellInfo).toString();
- valuesList.add(cellInfo);
+ if (!StringUtils.isEmpty(cellInfo)){
+ cellInfo=new BigDecimal(""+cellInfo).toString();
+ valuesList.add(cellInfo);
+ }else{
+ valuesList.add(cellInfo);
+ }
}
else {
valuesList.add(cellInfo);
}
-
}
- System.out.println("size : "+valuesList.size());
- System.out.println("value : "+valuesList);
+
SysUser sysUser=new SysUser();
- sysUser.setCompany(valuesList.get(0));//单位
- sysUser.setDepartment(valuesList.get(1));//部门
- sysUser.setArp((int)Double.parseDouble(valuesList.get(2))+"");//arp号
- sysUser.setName(valuesList.get(3));//姓名
- sysUser.setAccount(valuesList.get(4));//账号
-
- String PW_PATTERN = "(?=.*[A-Z])(?=.*[a-z])(?=.*[0-9])(?=.*[~!@#$%^&*_.]).{8,}";
- if (!valuesList.get(5).matches(PW_PATTERN)){
- errorMsg += "第"+i+"行,密码必须8位以上,并且包含大小写字母、数字、特殊符号三种以上";
+ if (valuesList.get(0) != null && !StringUtils.isEmpty(valuesList.get(0))){
+ sysUser.setCompany(valuesList.get(0));//单位
+ }else {
+ errorMsg += "第"+i+"行,单位不能为空";
+ continue;
}
-
- sysUser.setPassword(MD5Utils.encode(valuesList.get(5))+"");//密码
+ if (valuesList.get(1) != null && !StringUtils.isEmpty(valuesList.get(1))){
+ sysUser.setDepartment(valuesList.get(1));//部门
+ }else {
+ errorMsg += "第"+i+"行,部门不能为空";
+ continue;
+ }
+ if (valuesList.get(2) != null && !StringUtils.isEmpty(valuesList.get(2))){
+ sysUser.setArp((int)Double.parseDouble(valuesList.get(2))+"");//arp号
+ }else {
+ errorMsg += "第"+i+"行,arp不能为空";
+ continue;
+ }
+ if (valuesList.get(3) != null && !StringUtils.isEmpty(valuesList.get(3))){
+ sysUser.setName(valuesList.get(3));//姓名
+ }else {
+ errorMsg += "第"+i+"行,姓名不能为空";
+ continue;
+ }
+ if (valuesList.get(4) != null && !StringUtils.isEmpty(valuesList.get(4))){
+ sysUser.setAccount(valuesList.get(4));//账号
+ }else {
+ errorMsg += "第"+i+"行,账号不能为空";
+ continue;
+ }
+ if (valuesList.get(5) != null && !StringUtils.isEmpty(valuesList.get(5))){
+ String PW_PATTERN = "(?=.*[A-Z])(?=.*[a-z])(?=.*[0-9])(?=.*[~!@#$%^&*_.]).{8,}";
+ if (!valuesList.get(5).matches(PW_PATTERN)){
+ errorMsg += "第"+i+"行,密码必须8位以上,并且包含大小写字母、数字、特殊符号三种以上";
+ continue;
+ }
+ sysUser.setPassword(MD5Utils.encode(valuesList.get(5))+"");//密码
+ }else {
+ errorMsg += "第"+i+"行,密码不能为空";
+ continue;
+ }
//valuesList.get(8) id卡号检查
if (valuesList.get(8) != null && valuesList.get(8).length()>0){
@@ -208,16 +253,47 @@
//8位补齐20位，否则不做操作
String idCard = "E0E01E000A" + idCardUpper + "01";
sysUser.setIdCard(idCard);//id卡号
+ }else {
+ sysUser.setIdCard(idCardUpper);//id卡号
}
}else{
- FacesUtils.warn("第"+i+"行,id卡号需要8位或者20位");
- return;
+ errorMsg += ("第"+i+"行,id卡号需要8位或者20位");
+ continue;
}
+ }
+
+ // 检查ARP号
+ if (this.sysUserService.isSysUserExist(sysUser.getArp(), null, null, null)) {
+ errorMsg += ("第"+i+"行,ARP已存在");
+ continue;
+ }
+ // 检查登陆账号
+ if (this.sysUserService.isSysUserExist(null, sysUser.getAccount(), null, null)) {
+ errorMsg += ("第"+i+"行,登陆账号已存在");
+ continue;
+ }
+ if (!StringUtils.isEmpty(sysUser.getIdCard()) && this.sysUserService.isSysUserExist(null, null, sysUser.getIdCard(), null)) {
+ errorMsg += ("第"+i+"行,ID卡号已存在");
+ continue;
}
sysUser.setPhone(valuesList.get(6));//电话
sysUser.setEmail(valuesList.get(7));//邮箱
- sysUser.setPoint((int)Double.parseDouble(valuesList.get(9)));//分数
- sysUser.setRoleId(valuesList.get(10));//角色
+ if (valuesList.get(9) != null){
+ sysUser.setPoint((int)Double.parseDouble(valuesList.get(9)));//分数
+ }else {
+ errorMsg += "第"+i+"行,分数不能为空";
+ continue;
+ }
+ if (valuesList.get(10) != null){
+ sysUser.setRoleId(valuesList.get(10));//角色
+ }else {
+ errorMsg += "第"+i+"行,角色不能为空";
+ continue;
+ }
+ if (valuesList.get(12) == null){
+ errorMsg += "第"+i+"行,可见度不能为空";
+ continue;
+ }
if(valuesList.get(11).equals("是")){
sysUser.setApproverFlag(ApproverFlag.YES);
}else {
@@ -235,22 +311,33 @@
if(valuesList.get(12).equals(SeeFlag.LEADING.getText())){
sysUser.setSeeFlag(SeeFlag.LEADING);
}
- if(valuesList.size()==14){
- sysUser.setMemo(valuesList.get(13));
- }else {
- sysUser.setMemo("");
+
+ if (valuesList.size() > 13 && !valuesList.get(13).replace(" ","").isEmpty()){
+ String[] projects = valuesList.get(13).split(",");
+ for (String project : projects) {
+ //不存再就直接推出
+ if (!sysProjectService.isExistProject(project)) {
+ errorMsg += ("课题组不存在,（" + i + "行）");
+ continue;
+ }
+ }
+ //都存在就设置
+ sysUser.setProject(valuesList.get(13).replace(" ",""));
+ }else{
+ sysUser.setProject(null);
}
sysUser.setValidFlag(ValidFlag.VALID);
userList.add(sysUser);
}
- if (errorMsg != null){
- FacesUtils.warn(errorMsg);
- }
this.sysUserService.insertSysUserList(userList);
System.out.println("=========导入结束=====");
- FacesUtils.info("导入成功。");
+ if (errorMsg != null && !StringUtils.isEmpty(errorMsg)){
+ FacesUtils.warn(errorMsg);
+ }else {
+ FacesUtils.info("导入成功。");
+ }
}catch (Exception ex) {
ex.printStackTrace();
FacesUtils.info("导入失败。");
@@ -397,8 +484,14 @@
return;
}
- // 检查ARP号
- if (this.sysUserService.isSysUserExist(this.sysUser.getArp(), null, null, this.sysUser.getId())) {
+ // 检查ARP号 //除自己外的arp
+// if (this.sysUserService.isSysUserExist(this.sysUser.getArp(), null, null, this.sysUser.getId())) {
+// FacesUtils.warn("ARP已存在。");
+// return;
+// }
+ List<SysUser> list = sysUserService.getUserByArp(this.sysUser.getArp());
+ assert list.size() < 2;
+ if (list.size() > 0 && !list.get(0).getId().equals(this.sysUser.getId())) {
FacesUtils.warn("ARP已存在。");
return;
}
@@ -438,6 +531,11 @@
if(sysUser.getPassword()==null || sysUser.getPassword().equals("")){
sysUser.setPassword(this.editPasswor);
}else {
+ String PW_PATTERN = "(?=.*[A-Z])(?=.*[a-z])(?=.*[0-9])(?=.*[~!@#$%^&*_.]).{8,}";
+ if (!sysUser.getPassword().matches(PW_PATTERN)){
+ FacesUtils.warn("密码必须8位以上,并且包含大小写字母、数字、特殊符号三种以上");
+ return;
+ }
sysUser.setPassword(MD5Utils.encode(sysUser.getPassword()));
}
this.sysUserService.updateSysUser(sysUser);
@@ -468,6 +566,16 @@
}
}
+
+ public void initPage() {
+ sysUser = sysUserService.getSysUser(getUser().getId());
+ role = baseRoleService.getRoleByUserId(sysUser.getId());
+ }
+ public boolean isAccess(String info) {
+ String permission = role.getBtnPermission();
+ return permission.contains(info);
+ }
+
public LazyDataModel<SysUser> getDataModel() {
if (this.dataModel == null) {
this.dataModel = new LazyDataModel<SysUser>() {
@@ -475,11 +583,29 @@
public List<SysUser> load(int first, int pageSize, String sortField, SortOrder sortOrder, Map<String, Object> filters) {
List<SysUser> list = null;
try {
- int count = sysUserService.getSysUserTotalCount(arp, name,departmentName);
- this.setRowCount(count);
- if (count > 0) {
- list = sysUserService.getSysUserList(arp, name,departmentName, first, pageSize);
+ //做可见人员过滤
+ String userPermission = role.getUserPermission();
+ if (userPermission.contains("自己")) {
+ list = Collections.singletonList(sysUserService.getSysUser(UserMngController.this.sysUser.getId()));
+ this.setRowCount(1);
+
+ }else if (userPermission.contains("课题组")){
+ project = sysUser.getProject();
+ int count = sysUserService.getUserCountInProject(arp, name,departmentName,project,company);
+ this.setRowCount(count);
+ if (count > 0) {
+ list = sysUserService.getUserInProject(arp, name,departmentName,project,company, first, pageSize);
+ }
+
+ }else{
+ int count = sysUserService.getSysUserTotalCount(arp, name,departmentName,project,company);
+ this.setRowCount(count);
+ if (count > 0) {
+ list = sysUserService.getSysUserList(arp, name,departmentName,project,company, first, pageSize);
+ }
}
+
+ selectedList = new ArrayList<>();
} catch (Exception e) {
logger.error(e);
}
@@ -488,21 +614,32 @@
@Override
public SysUser getRowData(String rowKey) {
- Iterator<SysUser> iterator = this.iterator();
- if (iterator != null) {
- SysUser su = null;
- while (iterator.hasNext()) {
- su = iterator.next();
- if (rowKey.equals(su.getId())) {
- return su;
- }
- }
- }
- return null;
+// Iterator<SysUser> iterator = this.iterator();
+// if (iterator != null) {
+// SysUser su = null;
+// while (iterator.hasNext()) {
+// su = iterator.next();
+// if (rowKey.equals(su.getId())) {
+// return su;
+// }
+// }
+// }
+ return sysUserService.getSysUser(rowKey);
}
};
}
return dataModel;
+ }
+
+ public void exportLab2Excel(){
+ try {
+ List<Map> list = sysUserService.getExportUserList(arp, name,departmentName,project,company);
+ sysUserService.exportUser2Excel(list);
+ FacesUtils.info("导出成功");
+ }catch (Exception e){
+ e.printStackTrace();
+ FacesUtils.warn("导出失败");
+ }
}
public SysUser getSysUser() {
@@ -604,4 +741,20 @@
public void setDepartmentName(String departmentName) {
this.departmentName = departmentName;
}
+
+ public String getProject() {
+ return project;
+ }
+
+ public void setProject(String project) {
+ this.project = project;
+ }
+
+ public String getCompany() {
+ return company;
+ }
+
+ public void setCompany(String company) {
+ this.company = company;
+ }
}
--
Gitblit v1.9.2