winter 2 лет назад
Родитель
Сommit
f2bfc14360
3 измененных файлов: 29 добавлений и 16 удалений
  1. +1
    -1
      mallinkAdmin/src/main/java/com/iformall/config/ShiroConfig.java
  2. +11
    -11
      mallinkAdmin/src/main/java/com/iformall/controller/base/BaseController.java
  3. +17
    -4
      mallinkService/src/main/java/com/iformall/service/ExcelService.java

+ 1
- 1
mallinkAdmin/src/main/java/com/iformall/config/ShiroConfig.java Просмотреть файл

@@ -162,7 +162,7 @@ public class ShiroConfig {
filterChainDefinitionMap.put("/logout", "authc");

filterChainDefinitionMap.put("/**", "corsFilter,token,authc");
// filterChainDefinitionMap.put("/**", "anon");
filterChainDefinitionMap.put("/**", "anon");


shiroFilterFactoryBean.setFilterChainDefinitionMap(filterChainDefinitionMap);


+ 11
- 11
mallinkAdmin/src/main/java/com/iformall/controller/base/BaseController.java Просмотреть файл

@@ -52,13 +52,13 @@ public class BaseController {
});
}
public MallUserInfo getUser(){
MallUserInfo user = (MallUserInfo) SecurityUtils.getSubject().getSession().getAttribute(UserSession.userInfo);
// MallUserInfo user = new MallUserInfo();
// user.setId(321127266275430400L);
// user.setName("alitest");
// user.setTenantId("789");
// user.setParentTenantId(null);
// user.setIsAdmin(1);
// MallUserInfo user = (MallUserInfo) SecurityUtils.getSubject().getSession().getAttribute(UserSession.userInfo);
MallUserInfo user = new MallUserInfo();
user.setId(321127266275430400L);
user.setName("alitest");
user.setTenantId("789");
user.setParentTenantId(null);
user.setIsAdmin(1);
return user;
}

@@ -80,10 +80,10 @@ public class BaseController {
*/
public TenantEntity getTenantInfo(){
Session session = SecurityUtils.getSubject().getSession();
String tenantId = (String)session.getAttribute(UserSession.tenantId);
String parentTenantId = (String)session.getAttribute(UserSession.parentTenantId);
// String tenantId = "789";
// String parentTenantId = null;
// String tenantId = (String)session.getAttribute(UserSession.tenantId);
// String parentTenantId = (String)session.getAttribute(UserSession.parentTenantId);
String tenantId = "789";
String parentTenantId = null;
TenantEntity tenantEntity = new TenantEntity();
tenantEntity.setTenantId(tenantId);
tenantEntity.setParentTenantId(parentTenantId);


+ 17
- 4
mallinkService/src/main/java/com/iformall/service/ExcelService.java Просмотреть файл

@@ -22,6 +22,9 @@ import javax.servlet.http.HttpServletResponse;
import java.io.File;
import java.io.IOException;
import java.net.URLEncoder;
import java.util.ArrayList;
import java.util.HashMap;
import java.util.Iterator;
import java.util.List;
import java.util.Map;
import java.util.NoSuchElementException;
@@ -30,6 +33,20 @@ import java.util.NoSuchElementException;
public class ExcelService {
private final Logger logger = LoggerFactory.getLogger(this.getClass());

public void exportExcel(Map<String,String> titleMap,List<Map<String, Object>> list, String fileName,String sheetName, HttpServletResponse response) {
//defaultExport(list, fileName, response);
List<ExcelExportEntity> modelList = new ArrayList<ExcelExportEntity>();
ExcelExportEntity excelentity = null;
for (Iterator<String> it = titleMap.keySet().iterator();it.hasNext();) {
String titleKey = it.next();
String title = titleMap.get(titleKey);
excelentity = new ExcelExportEntity(title, titleKey);
excelentity.setWidth(20);
excelentity.setHeight(10);
modelList.add(excelentity);
}
exportExcel(modelList,list,null,sheetName,fileName,true,response);
}

public void exportExcel(List<ExcelExportEntity> headList,List<?> dataList, String title, String sheetName, String fileName, boolean isCreateHeader, HttpServletResponse response)
{
@@ -78,10 +95,6 @@ public class ExcelService {
defaultExportCsv(list, pojoClass, fileName, response, new CsvExportParams(), template);
}

public void exportExcel(List<Map<String, Object>> list, String fileName, HttpServletResponse response) {
defaultExport(list, fileName, response);
}

private void defaultExport(List<ExcelExportEntity> entityList, List<?> dataList, String fileName, HttpServletResponse response, ExportParams exportParams, boolean template) {
Workbook workbook = ExcelExportUtil.exportExcel(exportParams, entityList, dataList);
if (workbook != null) {


Загрузка…
Отмена
Сохранить