✨ 添加新特性
1. 添加MaxKey用户通过excel导入功能-后端接口开发 100%
This commit is contained in:
yapeng.li
@@ -1,64 +0,0 @@
|
||||
package org.maxkey.domain;
|
||||
|
||||
import org.apache.commons.lang.StringUtils;
|
||||
|
||||
/**
|
||||
* @author yapeng.li
|
||||
* @date 2019.3.6
|
||||
*/
|
||||
public class ImportResultBaseVO {
|
||||
/**
|
||||
* 资源名
|
||||
*/
|
||||
private String name;
|
||||
/**
|
||||
* 状态
|
||||
*/
|
||||
private String status;
|
||||
/**
|
||||
* 描述
|
||||
*/
|
||||
private String desc;
|
||||
|
||||
public String getName() {
|
||||
return name;
|
||||
}
|
||||
|
||||
public void setName(String name) {
|
||||
this.name = name;
|
||||
}
|
||||
|
||||
public String getStatus() {
|
||||
return status;
|
||||
}
|
||||
|
||||
public void setStatus(Integer status) {
|
||||
if(status==0){
|
||||
this.status = "SUCCESS";
|
||||
}else if(status==1){
|
||||
this.status = "FAILURE";
|
||||
}else{
|
||||
this.status = "IGNORE";
|
||||
}
|
||||
}
|
||||
|
||||
public String getDesc() {
|
||||
if(StringUtils.isEmpty(desc)){
|
||||
return "";
|
||||
}
|
||||
return desc;
|
||||
}
|
||||
|
||||
public void setDesc(String desc) {
|
||||
this.desc = desc;
|
||||
}
|
||||
|
||||
@Override
|
||||
public String toString() {
|
||||
return "ImportResultBaseVO{" +
|
||||
"name='" + name + '\'' +
|
||||
", status='" + status + '\'' +
|
||||
", desc='" + desc + '\'' +
|
||||
'}';
|
||||
}
|
||||
}
|
||||
@@ -1,105 +0,0 @@
|
||||
package org.maxkey.domain;
|
||||
|
||||
import java.util.ArrayList;
|
||||
import java.util.List;
|
||||
|
||||
/**
|
||||
* @author yapeng.li
|
||||
* @since 2020/9/21 21:12
|
||||
*/
|
||||
public class ImportResultVO {
|
||||
|
||||
/**
|
||||
* 成功结果
|
||||
*/
|
||||
List<ImportResultBaseVO> success;
|
||||
/**
|
||||
* 失败结果
|
||||
*/
|
||||
List<ImportResultBaseVO> error;
|
||||
/**
|
||||
* 忽略结果
|
||||
*/
|
||||
List<ImportResultBaseVO> ignore;
|
||||
/**
|
||||
* 成功次数
|
||||
*/
|
||||
Integer successCount;
|
||||
/**
|
||||
* 失败次数
|
||||
*/
|
||||
Integer errorCount;
|
||||
/**
|
||||
* 忽略次数
|
||||
*/
|
||||
Integer ignoreCount;
|
||||
|
||||
public List<ImportResultBaseVO> getSuccess() {
|
||||
if(success==null){
|
||||
success = new ArrayList<>();
|
||||
}
|
||||
return success;
|
||||
}
|
||||
|
||||
public void setSuccess(List<ImportResultBaseVO> success) {
|
||||
this.success = success;
|
||||
}
|
||||
|
||||
public List<ImportResultBaseVO> getError() {
|
||||
if(error==null){
|
||||
error = new ArrayList<>();
|
||||
}
|
||||
return error;
|
||||
}
|
||||
|
||||
public void setError(List<ImportResultBaseVO> error) {
|
||||
this.error = error;
|
||||
}
|
||||
|
||||
public List<ImportResultBaseVO> getIgnore() {
|
||||
if(ignore==null){
|
||||
ignore = new ArrayList<>();
|
||||
}
|
||||
return ignore;
|
||||
}
|
||||
|
||||
public void setIgnore(List<ImportResultBaseVO> ignore) {
|
||||
this.ignore = ignore;
|
||||
}
|
||||
|
||||
public Integer getSuccessCount() {
|
||||
return successCount;
|
||||
}
|
||||
|
||||
public void setSuccessCount(Integer successCount) {
|
||||
this.successCount = successCount;
|
||||
}
|
||||
|
||||
public Integer getErrorCount() {
|
||||
return errorCount;
|
||||
}
|
||||
|
||||
public void setErrorCount(Integer errorCount) {
|
||||
this.errorCount = errorCount;
|
||||
}
|
||||
|
||||
public Integer getIgnoreCount() {
|
||||
return ignoreCount;
|
||||
}
|
||||
|
||||
public void setIgnoreCount(Integer ignoreCount) {
|
||||
this.ignoreCount = ignoreCount;
|
||||
}
|
||||
|
||||
@Override
|
||||
public String toString() {
|
||||
return "ImportResultVO{" +
|
||||
"success=" + success +
|
||||
", error=" + error +
|
||||
", ignore=" + ignore +
|
||||
", successCount=" + successCount +
|
||||
", errorCount=" + errorCount +
|
||||
", ignoreCount=" + ignoreCount +
|
||||
'}';
|
||||
}
|
||||
}
|
||||
@@ -1,19 +1,19 @@
|
||||
/*
|
||||
* Copyright [2020] [MaxKey of copyright http://www.maxkey.top]
|
||||
*
|
||||
*
|
||||
* Licensed under the Apache License, Version 2.0 (the "License");
|
||||
* you may not use this file except in compliance with the License.
|
||||
* You may obtain a copy of the License at
|
||||
*
|
||||
*
|
||||
* http://www.apache.org/licenses/LICENSE-2.0
|
||||
*
|
||||
*
|
||||
* Unless required by applicable law or agreed to in writing, software
|
||||
* distributed under the License is distributed on an "AS IS" BASIS,
|
||||
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
|
||||
* See the License for the specific language governing permissions and
|
||||
* limitations under the License.
|
||||
*/
|
||||
|
||||
|
||||
|
||||
package org.maxkey.domain;
|
||||
|
||||
@@ -32,7 +32,7 @@ import org.springframework.web.multipart.MultipartFile;
|
||||
/**
|
||||
* .
|
||||
* @author Crystal.Sea
|
||||
*
|
||||
*
|
||||
*/
|
||||
@Table(name = "MXK_USERINFO")
|
||||
public class UserInfo extends JpaBaseDomain {
|
||||
@@ -327,7 +327,7 @@ public class UserInfo extends JpaBaseDomain {
|
||||
}
|
||||
|
||||
/**
|
||||
*
|
||||
*
|
||||
*/
|
||||
public UserInfo() {
|
||||
super();
|
||||
@@ -467,7 +467,7 @@ public class UserInfo extends JpaBaseDomain {
|
||||
this.nickName = nickName;
|
||||
}
|
||||
|
||||
|
||||
|
||||
|
||||
public String getNameZhSpell() {
|
||||
return nameZhSpell;
|
||||
@@ -1147,64 +1147,64 @@ public class UserInfo extends JpaBaseDomain {
|
||||
|
||||
@Override
|
||||
public String toString() {
|
||||
return "UserInfo [username=" + username
|
||||
return "UserInfo [username=" + username
|
||||
+ ", password=" + password + ", decipherable=" + decipherable
|
||||
+ ", sharedSecret=" + sharedSecret
|
||||
+ ", sharedSecret=" + sharedSecret
|
||||
+ ", sharedCounter=" + sharedCounter + ", userType=" + userType
|
||||
+ ", windowsAccount=" + windowsAccount
|
||||
+ ", windowsAccount=" + windowsAccount
|
||||
+ ", displayName=" + displayName + ", nickName=" + nickName
|
||||
+ ", nameZHSpell=" + nameZhSpell
|
||||
+ ", nameZHShortSpell=" + nameZhShortSpell
|
||||
+ ", nameZHSpell=" + nameZhSpell
|
||||
+ ", nameZHShortSpell=" + nameZhShortSpell
|
||||
+ ", givenName=" + givenName
|
||||
+ ", middleName=" + middleName + ", familyName=" + familyName
|
||||
+ ", middleName=" + middleName + ", familyName=" + familyName
|
||||
+ ", honorificPrefix=" + honorificPrefix
|
||||
+ ", honorificSuffix=" + honorificSuffix
|
||||
+ ", honorificSuffix=" + honorificSuffix
|
||||
+ ", formattedName=" + formattedName + ", married=" + married
|
||||
+ ", gender=" + gender + ", birthDate=" + birthDate
|
||||
+ ", gender=" + gender + ", birthDate=" + birthDate
|
||||
+ ", pictureFile=" + pictureFile + ", idType="
|
||||
+ idType + ", idCardNo=" + idCardNo + ", webSite=" + webSite
|
||||
+ idType + ", idCardNo=" + idCardNo + ", webSite=" + webSite
|
||||
+ ", startWorkDate=" + startWorkDate
|
||||
+ ", authnType=" + authnType + ", email=" + email
|
||||
+ ", authnType=" + authnType + ", email=" + email
|
||||
+ ", emailVerified=" + emailVerified + ", mobile="
|
||||
+ mobile + ", mobileVerified=" + mobileVerified
|
||||
+ mobile + ", mobileVerified=" + mobileVerified
|
||||
+ ", passwordQuestion=" + passwordQuestion
|
||||
+ ", passwordAnswer=" + passwordAnswer + ", appLoginAuthnType=" + appLoginAuthnType
|
||||
+ ", appLoginPassword=" + appLoginPassword
|
||||
+ ", appLoginPassword=" + appLoginPassword
|
||||
+ ", protectedApps=" + protectedApps + ", protectedAppsMap="
|
||||
+ protectedAppsMap + ", passwordLastSetTime=" + passwordLastSetTime
|
||||
+ protectedAppsMap + ", passwordLastSetTime=" + passwordLastSetTime
|
||||
+ ", badPasswordCount="
|
||||
+ badPasswordCount + ", unLockTime=" + unLockTime
|
||||
+ badPasswordCount + ", unLockTime=" + unLockTime
|
||||
+ ", isLocked=" + isLocked + ", lastLoginTime="
|
||||
+ lastLoginTime + ", lastLoginIp=" + lastLoginIp
|
||||
+ lastLoginTime + ", lastLoginIp=" + lastLoginIp
|
||||
+ ", lastLogoffTime=" + lastLogoffTime
|
||||
+ ", passwordSetType=" + passwordSetType
|
||||
+ ", passwordSetType=" + passwordSetType
|
||||
+ ", loginCount=" + loginCount + ", locale=" + locale
|
||||
+ ", timeZone=" + timeZone + ", preferredLanguage=" + preferredLanguage
|
||||
+ ", timeZone=" + timeZone + ", preferredLanguage=" + preferredLanguage
|
||||
+ ", workCountry=" + workCountry
|
||||
+ ", workRegion=" + workRegion + ", workLocality=" + workLocality
|
||||
+ ", workRegion=" + workRegion + ", workLocality=" + workLocality
|
||||
+ ", workStreetAddress="
|
||||
+ workStreetAddress + ", workAddressFormatted=" + workAddressFormatted
|
||||
+ workStreetAddress + ", workAddressFormatted=" + workAddressFormatted
|
||||
+ ", workEmail=" + workEmail
|
||||
+ ", workPhoneNumber=" + workPhoneNumber + ", workPostalCode=" + workPostalCode
|
||||
+ ", workPhoneNumber=" + workPhoneNumber + ", workPostalCode=" + workPostalCode
|
||||
+ ", workFax=" + workFax
|
||||
+ ", homeCountry=" + homeCountry + ", homeRegion=" + homeRegion
|
||||
+ ", homeCountry=" + homeCountry + ", homeRegion=" + homeRegion
|
||||
+ ", homeLocality=" + homeLocality
|
||||
+ ", homeStreetAddress=" + homeStreetAddress
|
||||
+ ", homeStreetAddress=" + homeStreetAddress
|
||||
+ ", homeAddressFormatted=" + homeAddressFormatted
|
||||
+ ", homeEmail=" + homeEmail
|
||||
+ ", homeEmail=" + homeEmail
|
||||
+ ", homePhoneNumber=" + homePhoneNumber + ", homePostalCode="
|
||||
+ homePostalCode + ", homeFax=" + homeFax
|
||||
+ homePostalCode + ", homeFax=" + homeFax
|
||||
+ ", employeeNumber=" + employeeNumber + ", costCenter="
|
||||
+ costCenter + ", organization=" + organization
|
||||
+ costCenter + ", organization=" + organization
|
||||
+ ", division=" + division + ", departmentId="
|
||||
+ departmentId + ", department=" + department
|
||||
+ departmentId + ", department=" + department
|
||||
+ ", jobTitle=" + jobTitle + ", jobLevel=" + jobLevel
|
||||
+ ", managerId=" + managerId + ", manager=" + manager
|
||||
+ ", managerId=" + managerId + ", manager=" + manager
|
||||
+ ", assistantId=" + assistantId + ", assistant="
|
||||
+ assistant + ", entryDate=" + entryDate
|
||||
+ ", quitDate=" + quitDate + ", extraAttribute=" + extraAttribute
|
||||
+ assistant + ", entryDate=" + entryDate
|
||||
+ ", quitDate=" + quitDate + ", extraAttribute=" + extraAttribute
|
||||
+ ", extraAttributeName=" + extraAttributeName + ", extraAttributeValue="
|
||||
+ extraAttributeValue + ", extraAttributeMap=" + extraAttributeMap
|
||||
+ extraAttributeValue + ", extraAttributeMap=" + extraAttributeMap
|
||||
+ ", online=" + online + ", ldapDn="
|
||||
+ ldapDn + "]";
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user