ExcelImport

build.gradle

@@ -133,6 +133,7 @@ subprojects {
          compile group: 'commons-beanutils', name: 'commons-beanutils', version: '1.9.3'
          compile group: 'commons-codec', name: 'commons-codec', version: '1.15'
          compile group: 'commons-collections', name: 'commons-collections', version: '3.2.2'
+         compile group: 'org.apache.commons', name: 'commons-collections4', version: '4.4'
          //compile group: 'org.apache.commons', name: 'commons-csv', version: '1.7'
          compile group: 'org.apache.commons', name: 'commons-dbcp2', version: '2.6.0'
          compile group: 'commons-dbutils', name: 'commons-dbutils', version: '1.7'
@@ -154,6 +155,8 @@ subprojects {
          compile group: 'org.apache.velocity', name: 'velocity', version: '1.7'
          compile group: 'velocity', name: 'velocity-dep', version: '1.4'
          compile group: 'org.freemarker', name: 'freemarker', version: '2.3.30'
+         compile group: 'org.apache.xmlbeans', name: 'xmlbeans', version: '3.0.1'
+         compile group: 'org.apache.commons', name: 'commons-compress', version: '1.20'
          compile group: 'org.apache.poi', name: 'poi', version: "${poiVersion}"
          compile group: 'org.apache.poi', name: 'poi-ooxml', version: "${poiVersion}"
          compile group: 'org.apache.poi', name: 'poi-ooxml-schemas', version: "${poiVersion}"

maxkey-core/src/main/java/org/maxkey/domain/ExcelImport.java

@@ -0,0 +1,69 @@
+/*
+ * 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;
+
+import com.fasterxml.jackson.annotation.JsonIgnore;
+import javax.persistence.Column;
+import javax.persistence.GeneratedValue;
+import javax.persistence.GenerationType;
+import javax.persistence.Id;
+import org.apache.mybatis.jpa.persistence.JpaBaseDomain;
+import org.springframework.web.multipart.MultipartFile;
+
+/**
+ * .
+ * @author Crystal.Sea
+ * 
+ */
+public class ExcelImport extends JpaBaseDomain {
+
+    /**
+     * 
+     */
+    private static final long serialVersionUID = 4665009770629818479L;
+
+    @Id
+    @Column
+    @GeneratedValue(strategy = GenerationType.AUTO, generator = "uuid")
+    String id;
+ 
+    @JsonIgnore
+    protected MultipartFile excelFile;
+
+    public ExcelImport() {
+        super();
+    }
+
+    public String getId() {
+        return id;
+    }
+
+    public void setId(String id) {
+        this.id = id;
+    }
+
+    public MultipartFile getExcelFile() {
+        return excelFile;
+    }
+
+    public void setExcelFile(MultipartFile excelFile) {
+        this.excelFile = excelFile;
+    }
+ 
+
+}

maxkey-persistence/src/main/java/org/maxkey/persistence/service/UserInfoService.java

@@ -18,7 +18,23 @@
 package org.maxkey.persistence.service;
 
 
+import java.io.IOException;
+import java.io.InputStream;
+import java.util.ArrayList;
+import java.util.Comparator;
+import java.util.Date;
+import java.util.List;
+import java.util.TreeSet;
+import java.util.stream.Collectors;
+
 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.CellType;
+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;
@@ -38,6 +54,10 @@ 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 com.google.common.collect.Lists;
 
 
 /**
@@ -332,6 +352,278 @@ public class UserInfoService extends JpaBaseService<UserInfo> {
 		}
 	}
 	
+    public boolean importing(MultipartFile file) {
+        if(file ==null){
+            return false;
+        }
+        InputStream is = null;
+        List<UserInfo> userInfoList = null;
+        try {
+            is = file.getInputStream();
+            Workbook wb;
+            String xls = ".xls";
+            String xlsx = ".xlsx";
+            int columnSize = 46;
+            userInfoList = Lists.newArrayList();
+            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 <2 ) {
+                        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));
+                            }
+                        }
+                        userInfo.setStatus(1);
+                        userInfoList.add(passwordEncoder(userInfo));
+                    }
+                }
+            }
+            // 数据去重
+            if(CollectionUtils.isEmpty(userInfoList)){
+                userInfoList = userInfoList.stream().collect(Collectors.collectingAndThen(Collectors.toCollection(() -> new TreeSet<>(Comparator.comparing(o -> o.getUsername()))), ArrayList::new));
+            }
+           
+        } catch (IOException e) {
+            e.printStackTrace();
+        }finally {
+            if (is != null) {
+                try {
+                    is.close();
+                } catch (IOException e) {
+                    // TODO Auto-generated catch block
+                    e.printStackTrace();
+                }
+            }
+        }
+       
+        return batchInsert(userInfoList);
+    }
+
+
+    /**
+             *       根据数据格式返回数据
+     *
+     * @param cell
+     * @return
+     */
+    public static String getValue(Cell cell) {
+        if (cell == null) {
+            return "";
+        } else if (cell.getCellType() == CellType.BOOLEAN) {
+            return String.valueOf(cell.getBooleanCellValue());
+        } else if (cell.getCellType() == CellType.NUMERIC) {
+            cell.setCellType(CellType.STRING);
+            return String.valueOf(cell.getStringCellValue().trim());
+        } else {
+            return String.valueOf(cell.getStringCellValue().trim());
+        }
+    }
+	
 	public boolean changeSharedSecret(UserInfo userInfo){
 		return getMapper().changeSharedSecret(userInfo)>0;
 	}

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

@@ -28,6 +28,7 @@ import javax.validation.Valid;
 import org.apache.mybatis.jpa.persistence.JpaPageResults;
 import org.maxkey.constants.ConstantsOperateMessage;
 import org.maxkey.crypto.ReciprocalUtils;
+import org.maxkey.domain.ExcelImport;
 import org.maxkey.domain.UserInfo;
 import org.maxkey.persistence.service.UserInfoService;
 import org.maxkey.util.JsonUtils;
@@ -283,6 +284,19 @@ public class UserInfoController {
 		}
 	}
 	
+    @RequestMapping(value = "/import")
+    public ModelAndView importing(@ModelAttribute("excelImportFile")ExcelImport excelImportFile)  {
+        ModelAndView modelAndView=new ModelAndView("/userinfo/usersImport");
+        
+        if (excelImportFile.getExcelFile() != null && !excelImportFile.getExcelFile().isEmpty() && userInfoService.importing(excelImportFile.getExcelFile())) {
+             new Message(WebContext.getI18nValue(ConstantsOperateMessage.INSERT_SUCCESS), null, MessageType.success, OperateType.add, MessageScope.DB);
+        }else {
+             new Message(WebContext.getI18nValue(ConstantsOperateMessage.INSERT_ERROR), MessageType.error);
+        }
+        
+        return modelAndView;
+    }
+    
 	@InitBinder
 	public void binder(WebDataBinder binder) {
 		binder.registerCustomEditor(String.class, new PropertyEditorSupport() {

maxkey-web-manage/src/main/resources/templates/views/userinfo/usersImport.ftl

@@ -0,0 +1,48 @@
+<!DOCTYPE HTML>
+<html xmlns="http://www.w3.org/1999/xhtml">
+<head>
+	<#include  "../layout/header.ftl"/>
+	<#include  "../layout/common.cssjs.ftl"/>
+	<style   type="text/css">
+	  .table th, .table td {
+	    padding: .2rem;
+	    vertical-align: middle;
+	  }
+	</style>
+
+	<script type="text/javascript">
+	<!--
+	$(function(){	
+					
+	});
+	//-->
+	</script>
+</head>
+<body>
+
+<form 
+	enctype="multipart/form-data" 
+	method="post" type="label" autoclose="true"  action="<@base/>/userinfo/import"  
+	class="needs-validation" novalidate> 
+
+	  <table   class="table table-bordered" >
+			<tbody>
+			<tr>
+				<th><@locale code="userinfo.displayName" /> :</th>
+				<td>
+					<input class="form-control"  type="file" id="excelFile" name="excelFile"  />
+				</td>
+			</tr>
+			
+			<tr>
+				<td colspan="2"  class="center">
+					<input id="_method" type="hidden" name="_method"  value="post"/>
+		    		<input class="button btn btn-primary mr-3"  style="width:100px"  type="submit"    id="submitBtn" value="<@locale code="button.text.save" />"/>
+		    		
+				</td>
+			</tr>
+		</tbody>
+	  </table>
+</form>
+</body>
+</html>

maxkey-web-manage/src/main/resources/templates/views/userinfo/usersList.ftl

@@ -201,9 +201,15 @@ $(function () {
 				<td colspan="2"> 
 					 <div id="tool_box_right">
 					 	<input class="button btn btn-warning mr-3" id="changepwdBtn" type="button" value="<@locale code="login.password.changepassword"/>" />
-						<input class="button btn btn-warning mr-3 window" id="changepwdBtnHidden" type="hidden" value="<@locale code="login.password.changepassword"/>" 
+						<input class="button btn btn-warning mr-3 window" id="changepwdBtnHidden" type="button"
+						 value="<@locale code="login.password.changepassword"/>" 
 						 		    wurl="<@base/>/userinfo/forwardChangePassword" wwidth="600px" wheight="250px" />
 						 		    
+						 <input class="button btn btn-warning mr-3 window" id="usersImportBtn" type="button" 
+						 		value="<@locale code="Import"/>" 
+						 		    wurl="<@base/>/userinfo/import" wwidth="400px" wheight="250px" />
+						 		    
+						 		    		    
 						 <input class="button btn btn-success mr-3" id="addBtn" type="button" value="<@locale code="button.text.add"/>" 
 						 		    wurl="<@base/>/userinfo/forwardAdd"
 						 		    wwidth="960"