统计报表接口,数据梳理接口
This commit is contained in:
@@ -13,10 +13,7 @@ import io.swagger.annotations.Api;
|
||||
import io.swagger.annotations.ApiOperation;
|
||||
import lombok.extern.slf4j.Slf4j;
|
||||
import org.springframework.beans.factory.annotation.Value;
|
||||
import org.springframework.web.bind.annotation.PostMapping;
|
||||
import org.springframework.web.bind.annotation.RequestMapping;
|
||||
import org.springframework.web.bind.annotation.RequestParam;
|
||||
import org.springframework.web.bind.annotation.RestController;
|
||||
import org.springframework.web.bind.annotation.*;
|
||||
import org.springframework.web.multipart.MultipartFile;
|
||||
|
||||
import javax.annotation.Resource;
|
||||
@@ -44,6 +41,7 @@ public class DataHandlerController {
|
||||
|
||||
@Value("${mybatis.configuration.variables.enterpriseId}")
|
||||
private String eid;
|
||||
|
||||
@PostMapping("/importOaOldShopData")
|
||||
@ApiOperation("导入OA旧数据")
|
||||
public ResponseResult<Boolean> importOaOldShopData(MultipartFile file) {
|
||||
@@ -54,7 +52,7 @@ public class DataHandlerController {
|
||||
log.error("read file error:", e);
|
||||
}
|
||||
assert reader != null;
|
||||
log.info("----------------------:{}",file.getOriginalFilename());
|
||||
log.info("----------------------:{}", file.getOriginalFilename());
|
||||
List<Map<String, Object>> dataMapList = reader.read(0, 1, Integer.MAX_VALUE);
|
||||
ImportTaskDO importTaskDO = new ImportTaskDO();
|
||||
importTaskDO.setFileName(file.getOriginalFilename());
|
||||
@@ -64,7 +62,7 @@ public class DataHandlerController {
|
||||
importTaskDO.setCreateUserId(CurrentUserHolder.getUserId());
|
||||
importTaskDO.setCreateName(CurrentUserHolder.getUser().getName());
|
||||
importTaskDO.setCreateTime(System.currentTimeMillis());
|
||||
importTaskMapper.insert(eid ,importTaskDO);
|
||||
importTaskMapper.insert(eid, importTaskDO);
|
||||
dataHandlerServer.importOaOldShopData(dataMapList, file.getOriginalFilename(), CurrentUserHolder.getUser(), importTaskDO);
|
||||
return ResponseResult.success(true);
|
||||
}
|
||||
@@ -79,7 +77,7 @@ public class DataHandlerController {
|
||||
log.error("read file error:", e);
|
||||
}
|
||||
assert reader != null;
|
||||
log.info("----------------------:{}",file.getOriginalFilename());
|
||||
log.info("----------------------:{}", file.getOriginalFilename());
|
||||
List<Map<String, Object>> dataMapList = reader.read(0, 1, Integer.MAX_VALUE);
|
||||
ImportTaskDO importTaskDO = new ImportTaskDO();
|
||||
importTaskDO.setFileName(file.getOriginalFilename());
|
||||
@@ -89,10 +87,16 @@ public class DataHandlerController {
|
||||
importTaskDO.setCreateUserId(CurrentUserHolder.getUserId());
|
||||
importTaskDO.setCreateName(CurrentUserHolder.getUser().getName());
|
||||
importTaskDO.setCreateTime(System.currentTimeMillis());
|
||||
importTaskMapper.insert(eid ,importTaskDO);
|
||||
dataHandlerServer.dataStageHandler(dataMapList, file.getOriginalFilename(), CurrentUserHolder.getUser(), importTaskDO,flag);
|
||||
importTaskMapper.insert(eid, importTaskDO);
|
||||
dataHandlerServer.dataStageHandler(dataMapList, file.getOriginalFilename(), CurrentUserHolder.getUser(), importTaskDO, flag);
|
||||
return ResponseResult.success(true);
|
||||
}
|
||||
|
||||
|
||||
@GetMapping("decorationDataInit")
|
||||
@ApiOperation("装修数据初始化")
|
||||
public ResponseResult decorationDataInit() {
|
||||
dataHandlerServer.decorationDataInit();
|
||||
return ResponseResult.success(true);
|
||||
}
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user