I3_YF_SEAT
/
impp-core
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/dev' into test

Browse Source
yun-zuoyi
jenkins 6 years ago
parent 11fb13ae5b b656592889
commit de23645e3d
12 changed files with 288 additions and 162 deletions
Show Stats Download Patch File Download Diff File

20
modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/controller/busi/SysLogExceptionController.java
Unescape Escape View File

@ -1,6 +1,9 @@
package cn.estsh.i3plus.core.apiservice.controller.busi;
import cn.estsh.i3plus.core.api.iservice.busi.*;
import cn.estsh.i3plus.core.api.iservice.busi.ISysConfigService;
import cn.estsh.i3plus.core.api.iservice.busi.ISysFileService;
import cn.estsh.i3plus.core.api.iservice.busi.ISysLogExceptionService;
import cn.estsh.i3plus.core.api.iservice.busi.ISysMessageService;
import cn.estsh.i3plus.platform.common.tool.ExcelTool;
import cn.estsh.i3plus.platform.common.tool.FileTool;
import cn.estsh.i3plus.platform.common.tool.ZipTool;
@ -14,10 +17,10 @@ import cn.estsh.impp.framework.base.controller.CoreBaseController;
import cn.estsh.impp.framework.boot.exception.ImppBusiException;
import cn.estsh.impp.framework.boot.exception.ImppExceptionBuilder;
import cn.estsh.impp.framework.boot.exception.ImppExceptionEnum;
import cn.estsh.impp.framework.boot.util.ImppRedis;
import cn.estsh.impp.framework.boot.util.ResultBean;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
import org.apache.commons.compress.archivers.zip.ZipUtil;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.springframework.beans.factory.annotation.Autowired;
@ -25,6 +28,8 @@ import org.springframework.web.bind.annotation.GetMapping;
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RestController;
import javax.annotation.Resource;
import javax.persistence.EntityManager;
import java.io.File;
import java.util.ArrayList;
import java.util.Date;
@ -55,6 +60,12 @@ public class SysLogExceptionController extends CoreBaseController {
@Autowired
private ISysMessageService sysMessageService;
@Autowired
private EntityManager entityManager;
@Resource(name="redisRes")
private ImppRedis redisRes;
/**
* 异常日志复杂查询，分页，排序
* @param sysLogException 查询条件
@ -108,7 +119,10 @@ public class SysLogExceptionController extends CoreBaseController {
File zipFile = null;
File excelDir = null;
File excelFile;
ExcelTool excelTool;
try {
excelTool = new ExcelTool(entityManager, redisRes);
Pager pager = new Pager();
pager.setCurrentPage(1);
// 判断是否超过excel最大导出数量设定值
@ -138,7 +152,7 @@ public class SysLogExceptionController extends CoreBaseController {
excelFile = new File(excelDir + File.separator + SysLogException.class.getSimpleName() + pager.getCurrentPage() + ".xls");
excelFile.createNewFile();
ExcelTool.exportData(excelFile, listPager.getObjectList(), SysLogException.class, colName);
excelTool.exportData(excelFile, listPager.getObjectList(), SysLogException.class, colName);
result.add(sysFileService.uploadFile(excelFile));
pager.setCurrentPage(pager.getCurrentPage() + 1);

13
modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/controller/busi/SysLogOperateController.java
Unescape Escape View File

@ -14,6 +14,7 @@ import cn.estsh.impp.framework.base.controller.CoreBaseController;
import cn.estsh.impp.framework.boot.exception.ImppBusiException;
import cn.estsh.impp.framework.boot.exception.ImppExceptionBuilder;
import cn.estsh.impp.framework.boot.exception.ImppExceptionEnum;
import cn.estsh.impp.framework.boot.util.ImppRedis;
import cn.estsh.impp.framework.boot.util.ResultBean;
import cn.estsh.impp.framework.boot.util.ValidatorBean;
import io.swagger.annotations.Api;
@ -23,6 +24,8 @@ import org.slf4j.LoggerFactory;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.*;
import javax.annotation.Resource;
import javax.persistence.EntityManager;
import java.io.File;
import java.util.ArrayList;
import java.util.Date;
@ -56,6 +59,12 @@ public class SysLogOperateController extends CoreBaseController {
@Autowired
private ISysMessageService sysMessageService;
@Autowired
private EntityManager entityManager;
@Resource(name="redisRes")
private ImppRedis redisRes;
/**
* 添加操作日志
* @param logOperate 操作日志
@ -212,6 +221,8 @@ public class SysLogOperateController extends CoreBaseController {
excelDir = new File(System.getProperty("java.io.tmpdir") + File.separator + new Date().getTime());
excelDir.mkdir();
ExcelTool excelTool = new ExcelTool(entityManager, redisCore);
do {
listPager = logOperateService.querySysLogOperateByPager(sysLogOperate, pager);
pager = listPager.getObjectPager();
@ -220,7 +231,7 @@ public class SysLogOperateController extends CoreBaseController {
excelFile = new File(excelDir + File.separator + SysLogOperate.class.getSimpleName() + pager.getCurrentPage() + ".xls");
excelFile.createNewFile();
ExcelTool.exportData(excelFile, listPager.getObjectList(), SysLogOperate.class, colName);
excelTool.exportData(excelFile, listPager.getObjectList(), SysLogOperate.class, colName);
result.add(sysFileService.uploadFile(excelFile));
pager.setCurrentPage(pager.getCurrentPage() + 1);

16
modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/controller/busi/SysLogSystemController.java
Unescape Escape View File

@ -17,6 +17,7 @@ import cn.estsh.impp.framework.base.controller.CoreBaseController;
import cn.estsh.impp.framework.boot.exception.ImppBusiException;
import cn.estsh.impp.framework.boot.exception.ImppExceptionBuilder;
import cn.estsh.impp.framework.boot.exception.ImppExceptionEnum;
import cn.estsh.impp.framework.boot.util.ImppRedis;
import cn.estsh.impp.framework.boot.util.ResultBean;
import cn.estsh.impp.framework.boot.util.ValidatorBean;
import io.swagger.annotations.Api;
@ -26,6 +27,8 @@ import org.slf4j.LoggerFactory;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.*;
import javax.annotation.Resource;
import javax.persistence.EntityManager;
import java.io.File;
import java.util.ArrayList;
import java.util.Date;
@ -56,6 +59,12 @@ public class SysLogSystemController extends CoreBaseController{
@Autowired
private ISysMessageService sysMessageService;
@Autowired
private EntityManager entityManager;
@Resource(name="redisRes")
private ImppRedis redisRes;
/**
* 新增系统日志
* @param logSystem 系统日志
@ -166,7 +175,7 @@ public class SysLogSystemController extends CoreBaseController{
}
/**
* 导出系统异常日志
* 导出系统异常日志A
* @param sysLogSystem 查询条件
* @param colName 导出列
* @param pageSize 页大小
@ -181,8 +190,11 @@ public class SysLogSystemController extends CoreBaseController{
File zipFile = null;
File excelDir = null;
File excelFile;
ExcelTool excelTool;
try {
startMultiService();
excelTool = new ExcelTool(entityManager, redisRes);
Pager pager = new Pager();
pager.setCurrentPage(1);
@ -213,7 +225,7 @@ public class SysLogSystemController extends CoreBaseController{
excelFile = new File(excelDir + File.separator + SysLogSystem.class.getSimpleName() + pager.getCurrentPage() + ".xls");
excelFile.createNewFile();
ExcelTool.exportData(excelFile, listPager.getObjectList(), SysLogSystem.class, colName);
excelTool.exportData(excelFile, listPager.getObjectList(), SysLogSystem.class, colName);
result.add(sysFileService.uploadFile(excelFile));
pager.setCurrentPage(pager.getCurrentPage() + 1);

15
modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/controller/busi/SysMenuController.java
Unescape Escape View File

@ -14,6 +14,7 @@ import cn.estsh.i3plus.pojo.platform.bean.SysMenu;
import cn.estsh.impp.framework.base.controller.CoreBaseController;
import cn.estsh.impp.framework.boot.exception.ImppBusiException;
import cn.estsh.impp.framework.boot.exception.ImppExceptionBuilder;
import cn.estsh.impp.framework.boot.util.ImppRedis;
import cn.estsh.impp.framework.boot.util.ResultBean;
import cn.estsh.impp.framework.boot.util.ValidatorBean;
import io.swagger.annotations.Api;
@ -24,6 +25,8 @@ import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.*;
import org.springframework.web.multipart.MultipartFile;
import javax.annotation.Resource;
import javax.persistence.EntityManager;
import javax.servlet.http.HttpServletResponse;
import java.io.*;
import java.util.HashMap;
@ -47,6 +50,12 @@ public class SysMenuController extends CoreBaseController {
@Autowired
private ISysMenuService sysMenuService;
@Autowired
private EntityManager entityManager;
@Resource(name="redisRes")
private ImppRedis redisRes;
/**
* 新增系统功能
* @param menu 系统功能
@ -289,6 +298,7 @@ public class SysMenuController extends CoreBaseController {
public ResultBean singleFileUpload(@RequestParam("file") MultipartFile multipart) {
try {
startMultiService();
ExcelTool excelTool = new ExcelTool(entityManager, redisRes);
if(multipart.isEmpty()){
throw ImppExceptionBuilder.newInstance()
@ -297,7 +307,7 @@ public class SysMenuController extends CoreBaseController {
.setErrorDetail("请选择需要上传的文件。")
.build();
}
List<SysMenu> list = ExcelTool.importData("permission.xls",multipart.getInputStream(), SysMenu.class);
List<SysMenu> list = excelTool.importData("permission.xls",multipart.getInputStream(), SysMenu.class);
Map<String,SysMenu> map = new HashMap<>();
list.forEach(menu -> {
@ -349,12 +359,13 @@ public class SysMenuController extends CoreBaseController {
public ResultBean singleDownload(HttpServletResponse response) {
try {
startMultiService();
ExcelTool excelTool = new ExcelTool(entityManager, redisRes);
String fileName = "menu_" + System.currentTimeMillis() + ".xls";
List<SysMenu> list = sysMenuService.findSysMenuAll();
File file = new File(fileName);
file.createNewFile();
File excle = ExcelTool.exportData(file, list, SysMenu.class, new String[]{
File excle = excelTool.exportData(file, list, SysMenu.class, new String[]{
"menuCode", "name","parentId","menuType","menuStatus","parentNameRdd","menuUrl","menuClassPath","menuGrade","menuSort"
,"menuCss","menuIcon","menuDescription"
});

27
modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/controller/busi/SysOrderNoRuleController.java
Unescape Escape View File

@ -1,6 +1,9 @@
package cn.estsh.i3plus.core.apiservice.controller.busi;
import cn.estsh.i3plus.core.api.iservice.busi.*;
import cn.estsh.i3plus.core.api.iservice.busi.ISysConfigService;
import cn.estsh.i3plus.core.api.iservice.busi.ISysFileService;
import cn.estsh.i3plus.core.api.iservice.busi.ISysMessageService;
import cn.estsh.i3plus.core.api.iservice.busi.ISysOrderNoRuleService;
import cn.estsh.i3plus.platform.common.exception.ImppExceptionEnum;
import cn.estsh.i3plus.platform.common.tool.ExcelTool;
import cn.estsh.i3plus.platform.common.tool.FileTool;
@ -18,6 +21,7 @@ import cn.estsh.impp.framework.boot.exception.ImppBusiException;
import cn.estsh.impp.framework.boot.exception.ImppExceptionBuilder;
import cn.estsh.impp.framework.boot.fastdfs.FastDFSClient;
import cn.estsh.impp.framework.boot.fastdfs.FastDFSFile;
import cn.estsh.impp.framework.boot.util.ImppRedis;
import cn.estsh.impp.framework.boot.util.ResultBean;
import cn.estsh.impp.framework.boot.util.ValidatorBean;
import io.swagger.annotations.Api;
@ -26,6 +30,8 @@ import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.*;
import org.springframework.web.multipart.MultipartFile;
import javax.annotation.Resource;
import javax.persistence.EntityManager;
import java.io.File;
import java.util.ArrayList;
import java.util.Date;
@ -47,9 +53,6 @@ public class SysOrderNoRuleController extends CoreBaseController {
private ISysOrderNoRuleService sysOrderNoRuleService;
@Autowired
private ISysDictionaryService sysDictionaryService;
@Autowired
private ISysConfigService sysConfigService;
@Autowired
@ -61,6 +64,12 @@ public class SysOrderNoRuleController extends CoreBaseController {
@Autowired
private FastDFSClient dfsClient;
@Autowired
private EntityManager entityManager;
@Resource(name="redisRes")
private ImppRedis redisRes;
/**
* 新增单号规则
* @param sysOrderNoRule 单号规则
@ -227,7 +236,9 @@ public class SysOrderNoRuleController extends CoreBaseController {
File zipFile = null;
File excelDir = null;
File excelFile;
ExcelTool excelTool;
try {
excelTool = new ExcelTool(entityManager, redisRes);
Pager pager = new Pager();
pager.setCurrentPage(1);
// 判断是否超过excel最大导出数量设定值
@ -256,7 +267,7 @@ public class SysOrderNoRuleController extends CoreBaseController {
// 将excel导出至临时文件夹
excelFile = new File(excelDir + File.separator + SysOrderNoRule.class.getSimpleName() + pager.getCurrentPage() + ".xls");
excelFile.createNewFile();
ExcelTool.exportData(excelFile, listPager.getObjectList(), SysOrderNoRule.class, colName);
excelTool.exportData(excelFile, listPager.getObjectList(), SysOrderNoRule.class, colName);
pager.setCurrentPage(pager.getCurrentPage() + 1);
} while (pager.getCurrentPage() <= pager.getTotalPages());
@ -290,7 +301,8 @@ public class SysOrderNoRuleController extends CoreBaseController {
@ApiOperation(value = "导入单号规则")
public ResultBean importSysOrderNoRule(@RequestParam("file") MultipartFile file) {
try {
List<SysOrderNoRule> sysOrderNoRuleList = ExcelTool.importData(file.getOriginalFilename(), file.getInputStream(), SysOrderNoRule.class);
ExcelTool excelTool = new ExcelTool(entityManager, redisRes);
List<SysOrderNoRule> sysOrderNoRuleList = excelTool.importData(file.getOriginalFilename(), file.getInputStream(), SysOrderNoRule.class);
// 初始化数据
for (SysOrderNoRule sysOrderNoRule : sysOrderNoRuleList) {
sysOrderNoRule.setOrderNoRuleStatus(CommonEnumUtil.TRUE_OR_FALSE.TRUE.getValue());
@ -310,13 +322,14 @@ public class SysOrderNoRuleController extends CoreBaseController {
public ResultBean downSysOrderNoRuleTemplate() {
try {
startMultiService();
ExcelTool excelTool = new ExcelTool(entityManager, redisRes);
String importTemplateCode = SysOrderNoRule.class.getSimpleName() + "ImportTemplate";
// 查询服务器中是否存在模板文件
SysFile sysFile = sysFileService.getSysFileByFileCode(importTemplateCode);
if(sysFile == null){
FastDFSFile fastDFSFile = new FastDFSFile(SysOrderNoRule.class.getSimpleName() + "ImportTemplate.xls",
ExcelTool.importTemplate(SysOrderNoRule.class), ".xls");
excelTool.importTemplate(SysOrderNoRule.class), ".xls");
sysFile = dfsClient.upload(fastDFSFile,CommonEnumUtil.SOFT_TYPE.CORE.getValue());
sysFile.setFileCode(importTemplateCode);

3
modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/controller/busi/SysUserController.java
Unescape Escape View File

@ -21,19 +21,16 @@ import cn.estsh.impp.framework.boot.auth.AuthUtil;
import cn.estsh.impp.framework.boot.exception.ImppBusiException;
import cn.estsh.impp.framework.boot.exception.ImppExceptionBuilder;
import cn.estsh.impp.framework.boot.exception.ImppExceptionEnum;
import cn.estsh.impp.framework.boot.util.ImppRedis;
import cn.estsh.impp.framework.boot.util.ResultBean;
import cn.estsh.impp.framework.boot.util.ValidatorBean;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
import io.swagger.annotations.ApiParam;
import org.apache.commons.lang3.RandomStringUtils;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.*;
import javax.annotation.Resource;
import java.util.List;
/**

12
modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/controller/busi/SysUserInfoController.java
Unescape Escape View File

@ -18,6 +18,7 @@ import cn.estsh.impp.framework.base.controller.CoreBaseController;
import cn.estsh.impp.framework.boot.auth.AuthUtil;
import cn.estsh.impp.framework.boot.exception.ImppBusiException;
import cn.estsh.impp.framework.boot.exception.ImppExceptionBuilder;
import cn.estsh.impp.framework.boot.util.ImppRedis;
import cn.estsh.impp.framework.boot.util.ResultBean;
import cn.estsh.impp.framework.boot.util.ValidatorBean;
import io.swagger.annotations.Api;
@ -29,6 +30,8 @@ import org.slf4j.LoggerFactory;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.*;
import javax.annotation.Resource;
import javax.persistence.EntityManager;
import java.io.File;
import java.util.ArrayList;
import java.util.Date;
@ -66,6 +69,11 @@ public class SysUserInfoController extends CoreBaseController{
@Autowired
private ISysMessageService sysMessageService;
@Autowired
private EntityManager entityManager;
@Resource(name="redisRes")
private ImppRedis redisRes;
/**
* 添加用户信息
* @param userInfo 用户信息
@ -381,8 +389,10 @@ public class SysUserInfoController extends CoreBaseController{
File zipFile = null;
File excelDir = null;
File excelFile;
ExcelTool excelTool;
try {
excelTool = new ExcelTool(entityManager, redisRes);
Pager pager = new Pager();
pager.setCurrentPage(1);
// 判断是否超过excel最大导出数量设定值
@ -412,7 +422,7 @@ public class SysUserInfoController extends CoreBaseController{
excelFile = new File(excelDir + File.separator + SysUserInfo.class.getSimpleName() + pager.getCurrentPage() + ".xls");
excelFile.createNewFile();
ExcelTool.exportData(excelFile, listPager.getObjectList(), SysUserInfo.class, colName);
excelTool.exportData(excelFile, listPager.getObjectList(), SysUserInfo.class, colName);
result.add(sysFileService.uploadFile(excelFile));
pager.setCurrentPage(pager.getCurrentPage() + 1);

3
modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/serviceimpl/busi/SysMessageService.java
Unescape Escape View File

@ -18,9 +18,7 @@ import cn.estsh.i3plus.pojo.platform.repository.*;
import cn.estsh.i3plus.pojo.platform.sqlpack.CoreHqlPack;
import cn.estsh.impp.framework.boot.exception.ImppExceptionBuilder;
import cn.estsh.impp.framework.boot.exception.ImppExceptionEnum;
import cn.estsh.impp.framework.boot.util.ImppRedis;
import com.alibaba.fastjson.JSON;
import com.netflix.discovery.converters.Auto;
import io.swagger.annotations.ApiOperation;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
@ -28,7 +26,6 @@ import org.springframework.amqp.rabbit.core.RabbitTemplate;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
import javax.annotation.Resource;
import java.util.List;
/**

13
modules/i3plus-core-apiservice/src/test/java/test/cn/estsh/i3plus/core/apiservice/serviceimpl/busi/TestSysLocaleResourceService.java
Unescape Escape View File

@ -4,9 +4,12 @@ import cn.estsh.i3plus.core.api.iservice.busi.ISysLocaleResourceService;
import cn.estsh.i3plus.core.apiservice.serviceimpl.busi.TestBase;
import cn.estsh.i3plus.platform.common.tool.ExcelTool;
import cn.estsh.i3plus.pojo.platform.bean.SysLocaleResource;
import cn.estsh.impp.framework.boot.util.ImppRedis;
import org.junit.Test;
import org.springframework.beans.factory.annotation.Autowired;
import javax.annotation.Resource;
import javax.persistence.EntityManager;
import java.io.File;
import java.io.IOException;
import java.util.Date;
@ -23,6 +26,13 @@ public class TestSysLocaleResourceService extends TestBase {
@Autowired
ISysLocaleResourceService sysLocaleResourceService;
@Autowired
private EntityManager entityManager;
@Resource(name = "redisRes")
private ImppRedis redisRes;
@Test
public void exportSysLocaleResourceData() throws IOException {
SysLocaleResource ds = new SysLocaleResource();
@ -32,7 +42,8 @@ public class TestSysLocaleResourceService extends TestBase {
};
File file = File.createTempFile(SysLocaleResource.class.getSimpleName() + new Date().getTime(), "Tp.xls");
try {
ExcelTool.exportData(file,sysLocaleResourceService.listSysLocaleResource(),SysLocaleResource.class,colName);
ExcelTool excelTool = new ExcelTool(entityManager, redisRes);
excelTool.exportData(file,sysLocaleResourceService.listSysLocaleResource(),SysLocaleResource.class,colName);
System.out.println(file.getPath());
} catch (Exception e) {
e.printStackTrace();

22
modules/i3plus-core-apiservice/src/test/java/test/cn/estsh/i3plus/core/apiservice/util/ExcelReadData.java
Unescape Escape View File

@ -2,8 +2,12 @@ package test.cn.estsh.i3plus.core.apiservice.util;
import cn.estsh.i3plus.platform.common.tool.ExcelTool;
import cn.estsh.i3plus.pojo.platform.bean.SysMenu;
import cn.estsh.impp.framework.boot.util.ImppRedis;
import com.alibaba.fastjson.JSON;
import org.springframework.beans.factory.annotation.Autowired;
import javax.annotation.Resource;
import javax.persistence.EntityManager;
import java.io.FileInputStream;
import java.util.List;
@ -15,8 +19,24 @@ import java.util.List;
* @Modify:
**/
public class ExcelReadData {
private static EntityManager entityManager;
@Autowired
public void setEntityManager(EntityManager entityManager) {
this.entityManager = entityManager;
}
private static ImppRedis redisRes;
@Resource(name = "redisRes")
public void setRedisRes(ImppRedis redisRes) {
this.redisRes = redisRes;
}
public static void main(String[] args) throws Exception{
List<SysMenu> list = ExcelTool.importData("permission.xls", new FileInputStream("E:\\permission.xls"), SysMenu.class);
ExcelTool excelTool = new ExcelTool(entityManager, redisRes);
List<SysMenu> list = excelTool.importData("permission.xls", new FileInputStream("E:\\permission.xls"), SysMenu.class);
System.out.println(JSON.toJSONString(list));
}

21
modules/i3plus-core-apiservice/src/test/java/test/cn/estsh/i3plus/core/apiservice/util/JavaTest.java
Unescape Escape View File

@ -3,9 +3,14 @@ package test.cn.estsh.i3plus.core.apiservice.util;
import cn.estsh.i3plus.platform.common.tool.ExcelTool;
import cn.estsh.i3plus.platform.common.tool.StringTool;
import cn.estsh.i3plus.pojo.platform.bean.SysMenu;
import cn.estsh.impp.framework.boot.util.ImppRedis;
import lombok.Data;
import org.apache.commons.lang3.StringUtils;
import org.springframework.beans.factory.annotation.Autowired;
import javax.annotation.Resource;
import javax.persistence.Entity;
import javax.persistence.EntityManager;
import java.io.File;
import java.util.*;
@ -931,6 +936,19 @@ public class JavaTest {
//endregion
);
private static EntityManager entityManager;
@Autowired
public void setEntityManager(EntityManager entityManager) {
this.entityManager = entityManager;
}
private static ImppRedis redisRes;
@Resource(name = "redisRes")
public void setRedisRes(ImppRedis redisRes) {
this.redisRes = redisRes;
}
public static void main(String[] args) throws Exception {
Map<String, Menu> map = getChildList(menu);
@ -956,7 +974,8 @@ public class JavaTest {
File file = new File("E:\\test.xls");
file.createNewFile();
ExcelTool.exportData(file, list, SysMenu.class, new String[]{
ExcelTool excelTool = new ExcelTool(entityManager, redisRes);
excelTool.exportData(file, list, SysMenu.class, new String[]{
"menuCode", "name", "parentId", "menuType", "menuStatus", "parentNameRdd", "menuUrl", "menuClassPath", "menuGrade", "menuSort"
, "menuCss", "menuIcon", "menuDescription"
});

13
modules/i3plus-core-apiservice/src/test/java/test/cn/estsh/i3plus/core/apiservice/util/TestExcelUtil.java
Unescape Escape View File

@ -4,11 +4,14 @@ import cn.estsh.i3plus.core.apiservice.serviceimpl.busi.TestBase;
import cn.estsh.i3plus.platform.common.tool.ExcelTool;
import cn.estsh.i3plus.pojo.base.enumutil.ImppEnumUtil;
import cn.estsh.i3plus.pojo.platform.bean.SysTool;
import cn.estsh.impp.framework.boot.util.ImppRedis;
import org.junit.Test;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Component;
import javax.annotation.PostConstruct;
import javax.annotation.Resource;
import javax.persistence.EntityManager;
import java.io.FileInputStream;
import java.io.FileNotFoundException;
import java.io.FileOutputStream;
@ -30,10 +33,18 @@ public class TestExcelUtil extends TestBase {
}
@Autowired
private EntityManager entityManager;
@Resource(name = "redisRes")
private ImppRedis redisRes;
@Test
public void importData() throws Exception{
try {
List sy = ExcelTool.importData("testOut.xls", new FileInputStream("E://testOut.xls"), SysTool.class);
ExcelTool excelTool = new ExcelTool(entityManager, redisRes);
List sy = excelTool.importData("testOut.xls", new FileInputStream("E://testOut.xls"), SysTool.class);
System.out.println(sy);
} catch (FileNotFoundException e) {
e.printStackTrace();

Write Preview
Loading…
Cancel
Save