Browse Source

tokenqu

dev
yinzuomei 4 years ago
parent
commit
af5bd46923
  1. 4
      epmet-user/epmet-user-server/src/main/java/com/epmet/controller/IcTripReportRecordController.java
  2. 2
      epmet-user/epmet-user-server/src/main/java/com/epmet/service/IcTripReportRecordService.java
  3. 6
      epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/IcTripReportRecordServiceImpl.java

4
epmet-user/epmet-user-server/src/main/java/com/epmet/controller/IcTripReportRecordController.java

@ -227,7 +227,7 @@ public class IcTripReportRecordController implements ResultDataResolver {
* @return
*/
@PostMapping("import")
public Result importExcel(MultipartFile file) {
public Result importExcel(@LoginUser TokenDto tokenDto, MultipartFile file) {
String userId = EpmetRequestHolder.getHeader(AppClientConstant.USER_ID);
// 1.暂存文件
@ -271,7 +271,7 @@ public class IcTripReportRecordController implements ResultDataResolver {
"行程上报导入失败");
// 3.执行导入
icTripReportRecordService.execAsyncExcelImport(fileSavePath, rstData.getTaskId());
icTripReportRecordService.execAsyncExcelImport(fileSavePath, rstData.getTaskId(),tokenDto.getCustomerId(),tokenDto.getUserId());
return new Result();
}
}

2
epmet-user/epmet-user-server/src/main/java/com/epmet/service/IcTripReportRecordService.java

@ -99,5 +99,5 @@ public interface IcTripReportRecordService extends BaseService<IcTripReportRecor
* 执行Excel导入
* @param filePath
*/
void execAsyncExcelImport(Path filePath, String importTaskId);
void execAsyncExcelImport(Path filePath, String importTaskId,String customerId,String userId);
}

6
epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/IcTripReportRecordServiceImpl.java

@ -334,12 +334,8 @@ public class IcTripReportRecordServiceImpl extends BaseServiceImpl<IcTripReportR
@Async
@Override
public void execAsyncExcelImport(Path filePath, String importTaskId) {
String userId = null;
String customerId=null;
public void execAsyncExcelImport(Path filePath, String importTaskId,String customerId,String userId) {
try {
userId = EpmetRequestHolder.getHeader(AppClientConstant.USER_ID);
customerId = EpmetRequestHolder.getHeader(AppClientConstant.CUSTOMER_ID);
//获取当前登录用户所属组织id
CustomerStaffInfoCacheResult staffInfo= queryCurrentStaff(customerId,userId);

Loading…
Cancel
Save