admin/MaxKey
1
0
Fork 0
mirror of https://gitee.com/dromara/MaxKey.git synced 2025-12-07 01:18:27 +08:00
Code Issues Packages Projects Releases Wiki Activity

Revert "Merge pull request #35 from FranisiL/master_dev_lyp"

Browse Source 
This reverts commit 60a40708b8c799c3c1bf95d4a1055f2406f37210, reversing
changes made to d96247e741cb82a285edda050f516ee7423baf54.
This commit is contained in:
Crystal.Sea 2020-11-10 22:47:11 +08:00
parent 60a40708b8
commit a555a251b1
6 changed files with 451 additions and 675 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
build.gradle
View File

@ -312,10 +312,6 @@ subprojects {
compile group: 'org.apache.tomcat.embed', name: 'tomcat-embed-core', version: '9.0.38'
//JULI logging implementation for embedded Tomcat
compile group: 'org.apache.tomcat.embed', name: 'tomcat-embed-logging-juli', version: '8.5.2'
//easyExcel
compile group: 'com.alibaba', name: 'easyexcel', version: '2.1.6'
}
jar {

3
maxkey-core/src/main/java/org/maxkey/constants/ConstantsOperateMessage.java
View File

@ -28,7 +28,4 @@ public final class ConstantsOperateMessage {
public static final String DELETE_SUCCESS = "message.action.delete.success";
public static final String DELETE_ERROR = "message.action.delete.error";
public static final String import_success = "message.action.import.success";
public static final String IMPORT_ERROR = "message.action.import.error";
}

1
maxkey-core/src/main/java/org/maxkey/domain/UserInfo.java
View File

@ -1147,6 +1147,7 @@ public class UserInfo extends JpaBaseDomain {
this.description = description;
}
/**
* @return the createdBy
*/

20
maxkey-core/src/main/java/org/maxkey/util/ExcelUtils.java
View File

@ -1,20 +0,0 @@
package org.maxkey.util;
import org.maxkey.domain.UserInfo;
import java.io.InputStream;
import java.util.List;
/**
* @author yapeng.li
* @since 2020/9/21 21:06
*/
public class ExcelUtils {
public static List<UserInfo> readExcel(InputStream in) throws Exception {
return null;
}
}

304
maxkey-persistence/src/main/java/org/maxkey/persistence/service/UserInfoService.java
View File

@ -18,14 +18,7 @@
package org.maxkey.persistence.service;
import com.google.common.collect.Lists;
import org.apache.mybatis.jpa.persistence.JpaBaseService;
import org.apache.poi.hssf.usermodel.HSSFWorkbook;
import org.apache.poi.ss.usermodel.Cell;
import org.apache.poi.ss.usermodel.Row;
import org.apache.poi.ss.usermodel.Sheet;
import org.apache.poi.ss.usermodel.Workbook;
import org.apache.poi.xssf.usermodel.XSSFWorkbook;
import org.maxkey.constants.ConstantsStatus;
import org.maxkey.crypto.ReciprocalUtils;
import org.maxkey.crypto.password.PasswordReciprocal;
@ -45,17 +38,11 @@ import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.jdbc.core.JdbcTemplate;
import org.springframework.security.crypto.password.PasswordEncoder;
import org.springframework.stereotype.Service;
import org.springframework.util.CollectionUtils;
import org.springframework.web.multipart.MultipartFile;
import java.io.IOException;
import java.io.InputStream;
import java.util.*;
import java.util.stream.Collectors;
/**
* @author Crystal.Sea
*
*/
@Service
public class UserInfoService extends JpaBaseService<UserInfo> {
@ -100,22 +87,6 @@ public class UserInfoService extends JpaBaseService<UserInfo> {
return false;
}
public boolean batchInsert(List<UserInfo> userInfos) {
for (UserInfo userInfo : userInfos) {
userInfo.setId(userInfo.generateId());
passwordEncoder(userInfo);
}
if (super.batchInsert(userInfos)) {
kafkaProvisioningService.send(
KafkaIdentityTopic.USERINFO_TOPIC,
userInfos,
KafkaIdentityAction.CREATE_ACTION);
return true;
}
return false;
}
public boolean update(UserInfo userInfo) {
userInfo = passwordEncoder(userInfo);
if (super.update(userInfo)) {
@ -130,276 +101,6 @@ public class UserInfoService extends JpaBaseService<UserInfo> {
return false;
}
public boolean importing(MultipartFile file) throws IOException {
if(file ==null){
return false;
}
// 解析excel文件中数据
List<UserInfo> userInfos = readExcel(file);
return batchInsert(userInfos);
}
private static List<UserInfo> readExcel(MultipartFile file) throws IOException {
InputStream is = file.getInputStream();
Workbook wb;
String xls = ".xls";
String xlsx = ".xlsx";
int columnSize = 46;
List<UserInfo> userInfos = Lists.newArrayList();
try {
if (file.getOriginalFilename().toLowerCase().endsWith(xls)) {
wb = new HSSFWorkbook(is);
} else if (file.getOriginalFilename().toLowerCase().endsWith(xlsx)) {
wb = new XSSFWorkbook(is);
} else {
throw new RuntimeException("maxKey用户导入没有Excel类型");
}
int sheetSize = wb.getNumberOfSheets();
//遍历sheet页
for (int i = 0; i < sheetSize; i++) {
Sheet sheet = wb.getSheetAt(i);
int rowSize = sheet.getLastRowNum() + 1;
//遍历行
for (int j = 1; j < rowSize; j++) {
Row row = sheet.getRow(j);
//略过空行和第一行
if (row == null || j == 0) {
continue;
} else {
//其他行是数据行
UserInfo userInfo = new UserInfo();
userInfo.setCreatedDate(DateUtils.formatDateTime(new Date()));
int rangeType = -1;
for (int k = 0; k < columnSize; k++) {
if (k == 0) {
// 登录账号
Cell cell = row.getCell(k);
userInfo.setUsername(getValue(cell));
} else if (k == 1) {
// 密码
Cell cell = row.getCell(k);
userInfo.setPassword(getValue(cell));
} else if (k == 2) {
// 员工编码
Cell cell = row.getCell(k);
userInfo.setEmployeeNumber(getValue(cell));
} else if (k == 3) {
// 用户类型
Cell cell = row.getCell(k);
userInfo.setUserType(getValue(cell));
} else if (k == 4) {
// 用户名
Cell cell = row.getCell(k);
userInfo.setDisplayName(getValue(cell));
} else if (k == 5) {
// 姓
Cell cell = row.getCell(k);
userInfo.setFamilyName(getValue(cell));
} else if (k == 6) {
// 名
Cell cell = row.getCell(k);
userInfo.setGivenName(getValue(cell));
} else if (k == 7) {
// 中间名
Cell cell = row.getCell(k);
userInfo.setMiddleName(getValue(cell));
} else if (k == 8) {
// 昵称
Cell cell = row.getCell(k);
userInfo.setNickName(getValue(cell));
} else if (k == 9) {
// 性别
Cell cell = row.getCell(k);
userInfo.setGender(Integer.valueOf(getValue(cell)));
} else if (k == 10) {
// AD域账号
Cell cell = row.getCell(k);
userInfo.setWindowsAccount(getValue(cell));
} else if (k == 11) {
// 出生日期
Cell cell = row.getCell(k);
userInfo.setBirthDate(getValue(cell));
} else if (k == 12) {
// 语言偏好
Cell cell = row.getCell(k);
userInfo.setPreferredLanguage(getValue(cell));
} else if (k == 13) {
// 时区
Cell cell = row.getCell(k);
userInfo.setTimeZone(getValue(cell));
}else if (k == 14) {
// 所属机构
Cell cell = row.getCell(k);
userInfo.setOrganization(getValue(cell));
}else if (k == 15) {
// 分支机构
Cell cell = row.getCell(k);
userInfo.setDivision(getValue(cell));
}else if (k == 16) {
// 部门名称
Cell cell = row.getCell(k);
userInfo.setDepartment(getValue(cell));
}else if (k == 17) {
// 成本中心
Cell cell = row.getCell(k);
userInfo.setCostCenter(getValue(cell));
}else if (k == 18) {
// 职位
Cell cell = row.getCell(k);
userInfo.setJobTitle(getValue(cell));
}else if (k == 19) {
// 级别
Cell cell = row.getCell(k);
userInfo.setJobLevel(getValue(cell));
}else if (k == 20) {
// 上级经理
Cell cell = row.getCell(k);
userInfo.setManager(getValue(cell));
}else if (k == 21) {
// 助理
Cell cell = row.getCell(k);
userInfo.setAssistant(getValue(cell));
}else if (k == 22) {
// 入职时间
Cell cell = row.getCell(k);
userInfo.setEntryDate(getValue(cell));
}else if (k == 23) {
// 离职时间
Cell cell = row.getCell(k);
userInfo.setQuitDate(getValue(cell));
}else if (k == 24) {
// 工作-国家
Cell cell = row.getCell(k);
userInfo.setWorkCountry(getValue(cell));
}else if (k == 25) {
// 工作-省
Cell cell = row.getCell(k);
userInfo.setWorkRegion(getValue(cell));
}else if (k == 26) {
// 工作-城市
Cell cell = row.getCell(k);
userInfo.setTimeZone(getValue(cell));
}else if (k == 27) {
// 工作-地址
Cell cell = row.getCell(k);
userInfo.setWorkLocality(getValue(cell));
}else if (k == 28) {
// 邮编
Cell cell = row.getCell(k);
userInfo.setWorkPostalCode(getValue(cell));
}else if (k == 29) {
// 传真
Cell cell = row.getCell(k);
userInfo.setWorkFax(getValue(cell));
}else if (k == 30) {
// 工作电话
Cell cell = row.getCell(k);
userInfo.setWorkPhoneNumber(getValue(cell));
}else if (k == 31) {
// 工作邮件
Cell cell = row.getCell(k);
userInfo.setWorkEmail(getValue(cell));
}else if (k == 32) {
// 证件类型 todo 现在数据库中存储的是tinyint
// Cell cell = row.getCell(k);
// userInfo.setIdType(getValue(cell));
}else if (k == 33) {
// 证件号码
Cell cell = row.getCell(k);
userInfo.setIdCardNo(getValue(cell));
}else if (k == 34) {
// 婚姻状态 todo 现在数据字段类型是 tinyint
// Cell cell = row.getCell(k);
// userInfo.setMarried(getValue(cell));
}else if (k == 35) {
// 开始工作时间
Cell cell = row.getCell(k);
userInfo.setStartWorkDate(getValue(cell));
}else if (k == 36) {
// 国家
Cell cell = row.getCell(k);
userInfo.setHomeCountry(getValue(cell));
}else if (k == 37) {
// 省
Cell cell = row.getCell(k);
userInfo.setHomeRegion(getValue(cell));
}else if (k == 38) {
// 城市
Cell cell = row.getCell(k);
userInfo.setHomeLocality(getValue(cell));
}else if (k == 39) {
// 家庭地址
Cell cell = row.getCell(k);
userInfo.setHomeStreetAddress(getValue(cell));
}else if (k == 40) {
// 家庭邮编
Cell cell = row.getCell(k);
userInfo.setHomePostalCode(getValue(cell));
}else if (k == 41) {
// 家庭传真
Cell cell = row.getCell(k);
userInfo.setHomeFax(getValue(cell));
}else if (k == 42) {
// 家庭电话
Cell cell = row.getCell(k);
userInfo.setHomePhoneNumber(getValue(cell));
}else if (k == 43) {
// 家庭邮箱
Cell cell = row.getCell(k);
userInfo.setHomeEmail(getValue(cell));
}else if (k == 44) {
// 个人主页
Cell cell = row.getCell(k);
userInfo.setWebSite(getValue(cell));
}else if (k == 45) {
// 即时通讯
Cell cell = row.getCell(k);
userInfo.setDefineIm(getValue(cell));
}
}
userInfos.add(userInfo);
}
}
}
// 数据去重
if(CollectionUtils.isEmpty(userInfos)){
userInfos = userInfos.stream().collect(Collectors.collectingAndThen(Collectors.toCollection(() -> new TreeSet<>(Comparator.comparing(o -> o.getUsername()))), ArrayList::new));
}
return userInfos;
} catch (IOException e) {
e.printStackTrace();
}finally {
if (is != null) {
is.close();
}
}
return userInfos;
}
/**
* 根据数据格式返回数据
*
* @param cell
* @return
*/
public static String getValue(Cell cell) {
if (cell == null) {
return "";
} else if (cell.getCellType() == Cell.CELL_TYPE_BOOLEAN) {
return String.valueOf(cell.getBooleanCellValue());
} else if (cell.getCellType() == Cell.CELL_TYPE_NUMERIC) {
cell.setCellType(Cell.CELL_TYPE_STRING);
return String.valueOf(cell.getStringCellValue().trim());
} else {
return String.valueOf(cell.getStringCellValue().trim());
}
}
public boolean delete(UserInfo userInfo) {
if( super.delete(userInfo)){
kafkaProvisioningService.send(
@ -586,7 +287,6 @@ public class UserInfoService extends JpaBaseService<UserInfo> {
/**
* 锁定用户：islock：1 用户解锁 2 用户锁定
*
* @param userInfo
*/
public void locked(UserInfo userInfo) {
@ -602,7 +302,6 @@ public class UserInfoService extends JpaBaseService<UserInfo> {
/**
* 用户登录成功后，重置错误密码次数和解锁用户
*
* @param userInfo
*/
public void unlock(UserInfo userInfo) {
@ -619,7 +318,6 @@ public class UserInfoService extends JpaBaseService<UserInfo> {
/**
* 更新错误密码次数
*
* @param userInfo
*/
public void updateBadPasswordCount(UserInfo userInfo) {

156
maxkey-web-manage/src/main/java/org/maxkey/web/contorller/UserInfoController.java
View File

@ -18,7 +18,6 @@
package org.maxkey.web.contorller;
import java.beans.PropertyEditorSupport;
import java.io.IOException;
import java.text.SimpleDateFormat;
import java.util.Date;
import java.util.HashMap;
@ -52,7 +51,6 @@ import org.springframework.web.bind.annotation.PathVariable;
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RequestParam;
import org.springframework.web.bind.annotation.ResponseBody;
import org.springframework.web.multipart.MultipartFile;
import org.springframework.web.servlet.ModelAndView;
@ -72,7 +70,6 @@ public class UserInfoController {
/**
* 查询用户列表
*
* @param user
* @return
*/
@ -92,6 +89,8 @@ public class UserInfoController {
}
@RequestMapping(value={"/list"})
public ModelAndView usersList(){
return new ModelAndView("/userinfo/usersList");
@ -105,7 +104,6 @@ public class UserInfoController {
/**
* 新增
*
* @param userInfo
* @param result
* @return
@ -128,28 +126,6 @@ public class UserInfoController {
return WebContext.forward("forwardUpdate/"+userInfo.getId());
}
/**
* 用户excel导入
*
* @param userInfo
* @param result
* @return
*/
/**
*
* @param file excel文件
* @return
*/
@RequestMapping(value = "/importing")
public Object importing(MultipartFile file) throws IOException {
if (userInfoService.importing(file)) {
return new Message(WebContext.getI18nValue(ConstantsOperateMessage.INSERT_SUCCESS), null, MessageType.success, OperateType.add, MessageScope.DB);
}else {
return new Message(WebContext.getI18nValue(ConstantsOperateMessage.INSERT_ERROR), MessageType.error);
}
}
@RequestMapping(value={"/forwardUpdate/{id}"})
public ModelAndView forwardUpdateUsers(@PathVariable("id")String id){
ModelAndView modelAndView=new ModelAndView("/userinfo/userUpdate");
@ -196,5 +172,133 @@ public class UserInfoController {
* @return
*/
@RequestMapping(value="/update")
public ModelAndView updateUsers(@Valid @ModelAttribute("userInfo")UserInfo userInfo,BindingResult result) {
_logger.debug(userInfo.toString());
if(result.hasErrors()){
// new Message(WebContext.getValidErrorText(),result);
}
_logger.info(userInfo.getExtraAttributeName());
_logger.info(userInfo.getExtraAttributeValue());
//userInfo.setNameZHShortSpell(StringUtils.hanYu2Pinyin(userInfo.getDisplayName(), true));
//userInfo.setNameZHSpell(StringUtils.hanYu2Pinyin(userInfo.getDisplayName(), false));
convertExtraAttribute(userInfo) ;
_logger.info(userInfo.getExtraAttribute());
if(userInfoService.update(userInfo)) {
new Message(WebContext.getI18nValue(ConstantsOperateMessage.UPDATE_SUCCESS),userInfo,MessageType.success,OperateType.add,MessageScope.DB);
}
new Message(WebContext.getI18nValue(ConstantsOperateMessage.UPDATE_ERROR),MessageType.error);
return WebContext.forward("forwardUpdate/"+userInfo.getId());
}
/**
* 批量删除用户
* @param id
* @return
*/
@ResponseBody
@RequestMapping(value="/batchDelete")
public Message batchDeleteUsers(@RequestParam("id")String id) {
_logger.debug(id);
if(userInfoService.batchDelete(StringUtils.string2List(id, ","))) {
return new Message(WebContext.getI18nValue(ConstantsOperateMessage.DELETE_SUCCESS),MessageType.success);
} else {
return new Message(WebContext.getI18nValue(ConstantsOperateMessage.DELETE_ERROR),MessageType.error);
}
}
/**
* 根据用户id删除用户
*
* @param id
* @return
*/
@ResponseBody
@RequestMapping(value="/delete")
public Message deleteUsersById(@RequestParam("id") String id) {
_logger.debug(id);
if(userInfoService.batchDelete(StringUtils.string2List(id, ","))) {
//provisioningPrepare.prepare(userInfo, OPERATEACTION.DELETE_ACTION);
return new Message(WebContext.getI18nValue(ConstantsOperateMessage.DELETE_SUCCESS),MessageType.success);
} else {
return new Message(WebContext.getI18nValue(ConstantsOperateMessage.DELETE_ERROR),MessageType.error);
}
}
protected void convertExtraAttribute(UserInfo userInfo) {
if(userInfo.getExtraAttributeValue()!=null){
String []extraAttributeLabel=userInfo.getExtraAttributeName().split(",");
String []extraAttributeValue=userInfo.getExtraAttributeValue().split(",");
Map<String,String> extraAttributeMap=new HashMap<String,String> ();
for(int i=0;i<extraAttributeLabel.length;i++){
extraAttributeMap.put(extraAttributeLabel[i], extraAttributeValue[i]);
}
String extraAttribute=JsonUtils.object2Json(extraAttributeMap);
userInfo.setExtraAttribute(extraAttribute);
}
}
@RequestMapping(value={"/forwardChangePassword/{id}"})
public ModelAndView forwardChangePassword(@PathVariable("id")String id){
ModelAndView modelAndView=new ModelAndView("/userinfo/changePassword");
UserInfo userInfo=userInfoService.get(id);
modelAndView.addObject("model", userInfo);
return modelAndView;
}
@RequestMapping(value={"/forwardChangeUserinfoStatus/{id}"})
public ModelAndView forwardChangeUserinfoStatus(@PathVariable("id")String id){
ModelAndView modelAndView=new ModelAndView("/userinfo/changeUserinfoStatus");
UserInfo userInfo=userInfoService.get(id);
modelAndView.addObject("model", userInfo);
return modelAndView;
}
@ResponseBody
@RequestMapping(value="/changePassword")
public Message changePassword( @ModelAttribute("userInfo")UserInfo userInfo) {
_logger.debug(userInfo.getId());
if(userInfoService.changePassword(userInfo)) {
return new Message(WebContext.getI18nValue(ConstantsOperateMessage.UPDATE_SUCCESS),MessageType.success);
} else {
return new Message(WebContext.getI18nValue(ConstantsOperateMessage.UPDATE_ERROR),MessageType.error);
}
}
@ResponseBody
@RequestMapping(value="/changeUserinfoStatus")
public Message changeUserinfoStatus( @ModelAttribute("userInfo")UserInfo userInfo) {
_logger.debug(userInfo.getId());
if(userInfoService.update(userInfo)) {
return new Message(WebContext.getI18nValue(ConstantsOperateMessage.UPDATE_SUCCESS),MessageType.success);
} else {
return new Message(WebContext.getI18nValue(ConstantsOperateMessage.UPDATE_ERROR),MessageType.error);
}
}
@InitBinder
public void binder(WebDataBinder binder) {
binder.registerCustomEditor(String.class, new PropertyEditorSupport() {
@Override
public void setAsText(String value) {
if(StringUtils.isNullOrBlank(value)){
setValue(null);
}else{
setValue(value);
}
}
});
SimpleDateFormat dateFormat = new SimpleDateFormat("yyyy-MM-dd");
dateFormat.setLenient(false);
binder.registerCustomEditor(Date.class, new CustomDateEditor(dateFormat, true));
}
}