Commit 1c654c41 by chenweisong

更新

parent ae89901f
...@@ -18,6 +18,8 @@ import io.swagger.annotations.*; ...@@ -18,6 +18,8 @@ import io.swagger.annotations.*;
import org.activiti.engine.*; import org.activiti.engine.*;
import org.activiti.engine.task.Task; import org.activiti.engine.task.Task;
import org.apache.commons.lang3.StringUtils; import org.apache.commons.lang3.StringUtils;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.*; import org.springframework.web.bind.annotation.*;
import org.springframework.web.multipart.MultipartFile; import org.springframework.web.multipart.MultipartFile;
...@@ -30,6 +32,10 @@ import java.util.*; ...@@ -30,6 +32,10 @@ import java.util.*;
@Api(tags = "模板 控制器", description = "Template Mgr") @Api(tags = "模板 控制器", description = "Template Mgr")
@RestController @RestController
public class TemplateController { public class TemplateController {
private static Logger logger = LoggerFactory.getLogger(TemplateController.class);
@Autowired @Autowired
private FilePathService filePathService; private FilePathService filePathService;
@Autowired @Autowired
...@@ -154,7 +160,7 @@ public class TemplateController { ...@@ -154,7 +160,7 @@ public class TemplateController {
@ApiImplicitParam(name = "missionType", value = "任务类型", dataType = "integer", paramType = "query") @ApiImplicitParam(name = "missionType", value = "任务类型", dataType = "integer", paramType = "query")
}) })
@GetMapping(value = "/excel/getDataByFilePath") @GetMapping(value = "/excel/getDataByFilePath")
public Object getDataByFilePath(String filePath, long templateId, Integer missionType) { public Object getDataByFilePath(long templateId, Integer missionType) {
Template template = templateService.findById(templateId); Template template = templateService.findById(templateId);
Map<String, List<BankData>> breakResultMap = new HashMap<>(); Map<String, List<BankData>> breakResultMap = new HashMap<>();
try { try {
...@@ -162,7 +168,7 @@ public class TemplateController { ...@@ -162,7 +168,7 @@ public class TemplateController {
params.setTitleRows(1); params.setTitleRows(1);
params.setHeadRows(1); params.setHeadRows(1);
ExcelImportResult<BankData> excelImportResult = ExcelImportUtil. ExcelImportResult<BankData> excelImportResult = ExcelImportUtil.
importExcelMore(new FileInputStream(new File(filePath)), BankData.class, params); importExcelMore(new FileInputStream(new File(template.getUpStreamAddr())), BankData.class, params);
List<BankData> bankDataList = excelImportResult.getList(); List<BankData> bankDataList = excelImportResult.getList();
String breakColumnEn = ExcelModelColumnUtils.getBreakColumn(template.getColumnName()); String breakColumnEn = ExcelModelColumnUtils.getBreakColumn(template.getColumnName());
if (StringUtils.isBlank(breakColumnEn)) { if (StringUtils.isBlank(breakColumnEn)) {
...@@ -190,6 +196,7 @@ public class TemplateController { ...@@ -190,6 +196,7 @@ public class TemplateController {
User user = sessionService.getLoginUser(); User user = sessionService.getLoginUser();
Map org = feignAuthService.getUserOrgById(user.getId()); Map org = feignAuthService.getUserOrgById(user.getId());
String key = org.get("fullname").toString().split(",")[1]; String key = org.get("fullname").toString().split(",")[1];
logger.info("bank name {}", key);
List<BankData> bankDataList = breakResultMap.get(key); List<BankData> bankDataList = breakResultMap.get(key);
List<List<String>> listArrayList = new ArrayList<>(); List<List<String>> listArrayList = new ArrayList<>();
bankDataList.forEach(bankData -> { bankDataList.forEach(bankData -> {
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment