Merge pull request 'spotlessApply 적용' (#170) from feat/training_260324 into develop
Reviewed-on: #170
This commit was merged in pull request #170.
This commit is contained in:
@@ -286,7 +286,8 @@ public class DatasetApiController {
|
|||||||
@ApiResponse(responseCode = "500", description = "서버 오류", content = @Content)
|
@ApiResponse(responseCode = "500", description = "서버 오류", content = @Content)
|
||||||
})
|
})
|
||||||
@PostMapping("/deliveries")
|
@PostMapping("/deliveries")
|
||||||
public ApiResponseDto<ResponseObj> insertDeliveriesDataset(@RequestBody AddDeliveriesReq req) throws IOException {
|
public ApiResponseDto<ResponseObj> insertDeliveriesDataset(@RequestBody AddDeliveriesReq req)
|
||||||
|
throws IOException {
|
||||||
return ApiResponseDto.createOK(datasetService.insertDeliveriesDataset(req));
|
return ApiResponseDto.createOK(datasetService.insertDeliveriesDataset(req));
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -62,8 +62,7 @@ import org.springframework.transaction.annotation.Transactional;
|
|||||||
public class DatasetService {
|
public class DatasetService {
|
||||||
|
|
||||||
private final DatasetCoreService datasetCoreService;
|
private final DatasetCoreService datasetCoreService;
|
||||||
@PersistenceContext
|
@PersistenceContext private EntityManager em;
|
||||||
private EntityManager em;
|
|
||||||
private final ObjectMapper mapper = new ObjectMapper();
|
private final ObjectMapper mapper = new ObjectMapper();
|
||||||
|
|
||||||
@Value("${file.dataset-dir}")
|
@Value("${file.dataset-dir}")
|
||||||
@@ -615,6 +614,7 @@ public class DatasetService {
|
|||||||
|
|
||||||
/**
|
/**
|
||||||
* 납품 데이터 등록
|
* 납품 데이터 등록
|
||||||
|
*
|
||||||
* @param req 폴더경로, 메모
|
* @param req 폴더경로, 메모
|
||||||
* @return 성공/실패 여부
|
* @return 성공/실패 여부
|
||||||
*/
|
*/
|
||||||
@@ -627,10 +627,7 @@ public class DatasetService {
|
|||||||
|
|
||||||
DatasetMngRegDto datasetMngRegDto = new DatasetMngRegDto();
|
DatasetMngRegDto datasetMngRegDto = new DatasetMngRegDto();
|
||||||
|
|
||||||
String uid = UUID.randomUUID()
|
String uid = UUID.randomUUID().toString().replace("-", "").toUpperCase();
|
||||||
.toString()
|
|
||||||
.replace("-", "")
|
|
||||||
.toUpperCase();
|
|
||||||
|
|
||||||
datasetMngRegDto.setUid(uid);
|
datasetMngRegDto.setUid(uid);
|
||||||
datasetMngRegDto.setDataType("DELIVER");
|
datasetMngRegDto.setDataType("DELIVER");
|
||||||
@@ -654,8 +651,7 @@ public class DatasetService {
|
|||||||
|
|
||||||
datasetCoreService.updateDatasetUploadStatus(datasetUid);
|
datasetCoreService.updateDatasetUploadStatus(datasetUid);
|
||||||
|
|
||||||
log.info("========== 전체 완료. 총 소요시간: {} ms ==========",
|
log.info("========== 전체 완료. 총 소요시간: {} ms ==========", System.currentTimeMillis() - startTime);
|
||||||
System.currentTimeMillis() - startTime);
|
|
||||||
|
|
||||||
return new ResponseObj(ApiResponseCode.OK, "업로드 성공하였습니다.");
|
return new ResponseObj(ApiResponseCode.OK, "업로드 성공하였습니다.");
|
||||||
}
|
}
|
||||||
@@ -681,8 +677,11 @@ public class DatasetService {
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
log.info("[{}] 완료. 총 {}건, 소요시간: {} ms",
|
log.info(
|
||||||
type.toUpperCase(), count, System.currentTimeMillis() - start);
|
"[{}] 완료. 총 {}건, 소요시간: {} ms",
|
||||||
|
type.toUpperCase(),
|
||||||
|
count,
|
||||||
|
System.currentTimeMillis() - start);
|
||||||
}
|
}
|
||||||
|
|
||||||
@Transactional
|
@Transactional
|
||||||
@@ -766,24 +765,3 @@ public class DatasetService {
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|||||||
@@ -24,7 +24,6 @@ import org.apache.commons.lang3.StringUtils;
|
|||||||
import org.springframework.data.domain.Page;
|
import org.springframework.data.domain.Page;
|
||||||
import org.springframework.stereotype.Service;
|
import org.springframework.stereotype.Service;
|
||||||
import org.springframework.transaction.annotation.Transactional;
|
import org.springframework.transaction.annotation.Transactional;
|
||||||
import org.springframework.transaction.support.TransactionSynchronizationManager;
|
|
||||||
|
|
||||||
@Service
|
@Service
|
||||||
@RequiredArgsConstructor
|
@RequiredArgsConstructor
|
||||||
|
|||||||
Reference in New Issue
Block a user