manager/my-worker
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Excel导入工具@ExcelField(attrName="")属性的支持

Browse Source
This commit is contained in:
thinkgem
2018-06-04 23:10:25 +08:00
parent 98ab05793b
commit 226d20d759
9 changed files with 86 additions and 47 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
modules/core/src/main/java/com/jeesite/common/utils/excel/fieldtype/AreaType.java
View File

@@ -3,6 +3,8 @@
*/
package com.jeesite.common.utils.excel.fieldtype;
import java.util.List;
import com.jeesite.common.lang.StringUtils;
import com.jeesite.modules.sys.entity.Area;
import com.jeesite.modules.sys.utils.AreaUtils;
@@ -15,11 +17,18 @@ import com.jeesite.modules.sys.utils.AreaUtils;
*/
public class AreaType {
private static ThreadLocal<List<Area>> cache = new ThreadLocal<>();
/**
* 获取对象值（导入）
*/
public static Object getValue(String val) {
for (Area e : AreaUtils.getAreaAllList()){
List<Area> cacheList = cache.get();
if (cacheList == null){
cacheList = AreaUtils.getAreaAllList();
cache.set(cacheList);
}
for (Area e : cacheList){
if (StringUtils.trimToEmpty(val).equals(e.getAreaName())){
return e;
}

11
modules/core/src/main/java/com/jeesite/common/utils/excel/fieldtype/CompanyType.java
View File

@@ -3,6 +3,8 @@
*/
package com.jeesite.common.utils.excel.fieldtype;
import java.util.List;
import com.jeesite.common.lang.StringUtils;
import com.jeesite.modules.sys.entity.Company;
import com.jeesite.modules.sys.utils.EmpUtils;
@@ -15,11 +17,18 @@ import com.jeesite.modules.sys.utils.EmpUtils;
*/
public class CompanyType {
private static ThreadLocal<List<Company>> cache = new ThreadLocal<>();
/**
* 获取对象值（导入）
*/
public static Object getValue(String val) {
for (Company e : EmpUtils.getCompanyAllList()){
List<Company> cacheList = cache.get();
if (cacheList == null){
cacheList = EmpUtils.getCompanyAllList();
cache.set(cacheList);
}
for (Company e : cacheList){
if (StringUtils.trimToEmpty(val).equals(e.getCompanyName())){
return e;
}

11
modules/core/src/main/java/com/jeesite/common/utils/excel/fieldtype/OfficeType.java
View File

@@ -3,6 +3,8 @@
*/
package com.jeesite.common.utils.excel.fieldtype;
import java.util.List;
import com.jeesite.common.lang.StringUtils;
import com.jeesite.modules.sys.entity.Office;
import com.jeesite.modules.sys.utils.EmpUtils;
@@ -15,11 +17,18 @@ import com.jeesite.modules.sys.utils.EmpUtils;
*/
public class OfficeType {
private static ThreadLocal<List<Office>> cache = new ThreadLocal<>();
/**
* 获取对象值（导入）
*/
public static Object getValue(String val) {
for (Office e : EmpUtils.getOfficeAllList()){
List<Office> cacheList = cache.get();
if (cacheList == null){
cacheList = EmpUtils.getOfficeAllList();
cache.set(cacheList);
}
for (Office e : cacheList){
if (StringUtils.trimToEmpty(val).equals(e.getOfficeName())){
return e;
}

10
modules/core/src/main/java/com/jeesite/common/utils/excel/fieldtype/PostListType.java
View File

@@ -27,13 +27,13 @@ public class PostListType {
*/
public static Object getValue(String val) {
List<Post> postList = ListUtils.newArrayList();
List<Post> allPostList = cache.get();
if (allPostList == null){
allPostList = postService.findList(new Post());
cache.set(allPostList); // 不知道会不会引起内存泄露，先这样用着
List<Post> cacheList = cache.get();
if (cacheList == null){
cacheList = postService.findList(new Post());
cache.set(cacheList);
}
for (String s : StringUtils.split(val, ",")) {
for (Post e : allPostList) {
for (Post e : cacheList) {
if (StringUtils.trimToEmpty(s).equals(e.getPostName())) {
postList.add(e);
}

1
modules/core/src/main/java/com/jeesite/modules/sys/db/InitCoreData.java
View File

@@ -359,7 +359,6 @@ public class InitCoreData extends BaseInitDataTests {
else if("save".equals(action)){
EmpUser entity = (EmpUser)params[1];
entity.setIsNewRecord(true);
entity.setPassword(UserService.encryptPassword(entity.getPassword()));
empUserService.save(entity);
// 设置当前为管理员，否则无法保存用户角色关系
entity.setCurrentUser(new User(User.SUPER_ADMIN_CODE));