forked from 9oorm-Oreum/9oorm-Oreum-backend
-
Notifications
You must be signed in to change notification settings - Fork 0
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
- Loading branch information
1 parent
0c2634e
commit 58ce3e2
Showing
19 changed files
with
170 additions
and
263 deletions.
There are no files selected for viewing
189 changes: 93 additions & 96 deletions
189
src/main/java/com/example/goorm/FileItemReaderJobConfig.java
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,96 +1,93 @@ | ||
| //package com.example.goorm; | ||
| // | ||
| //import com.example.goorm.oreum.CsvReader; | ||
| //import com.example.goorm.oreum.CsvWriter; | ||
| //import com.example.goorm.oreum.Oreum; | ||
| //import com.example.goorm.oreum.Test; | ||
| //import com.example.goorm.oreum.repository.OreumRepository; | ||
| //import com.example.goorm.oreum.repository.TestRepository; | ||
| //import lombok.RequiredArgsConstructor; | ||
| //import lombok.extern.slf4j.Slf4j; | ||
| //import org.springframework.batch.core.Job; | ||
| //import org.springframework.batch.core.Step; | ||
| //import org.springframework.batch.core.configuration.annotation.JobBuilderFactory; | ||
| //import org.springframework.batch.core.configuration.annotation.StepBuilderFactory; | ||
| //import org.springframework.batch.item.ItemProcessor; | ||
| //import org.springframework.context.annotation.Bean; | ||
| //import org.springframework.context.annotation.Configuration; | ||
| // | ||
| //@Slf4j | ||
| //@Configuration | ||
| //@RequiredArgsConstructor | ||
| //public class FileItemReaderJobConfig { | ||
| // private final JobBuilderFactory jobBuilderFactory; | ||
| // private final StepBuilderFactory stepBuilderFactory; | ||
| // | ||
| // private final TestRepository testRepository; | ||
| // private final CsvReader csvReader; | ||
| // private final CsvWriter csvWriter; | ||
| // | ||
| // private static final int chunkSize = 366; | ||
| // | ||
| // private static int monthCheck = 1; | ||
| // private static int dayCheck = 1; | ||
| // | ||
| // // csvFileItemReaderJob 라는 이름의 job 생성 | ||
| // @Bean | ||
| // public Job csvFileItemReaderJob() { | ||
| // return jobBuilderFactory.get("csvFileItemReaderJob") | ||
| // .start(csvFileItemReaderStep()) | ||
| // .build(); | ||
| // } | ||
| // | ||
| // // csvFileItemReaderStep 이라는 이름의 Step 생성 | ||
| // @Bean | ||
| // public Step csvFileItemReaderStep() { | ||
| // return stepBuilderFactory.get("csvFileItemReaderStep") | ||
| // .<String, Test>chunk(chunkSize) | ||
| // // Reader 에서 읽어올 타입 - String, Writer에 넘겨줄 타입이 Oreum | ||
| // .reader(csvReader.csvFileItemReader()) // 일단 csv에서 String 읽기 | ||
| // .processor(csvProcessor()) // String을 가공 | ||
| // .writer(csvWriter) | ||
| // .build(); | ||
| // } | ||
| // @Bean | ||
| // public ItemProcessor<String, Test> csvProcessor() { | ||
| // return oreumStr -> { | ||
| // System.out.println(oreumStr); | ||
| // String[] lineArr = oreumStr.split(","); | ||
| // String name = lineArr[0]; | ||
| // String type = lineArr[1].split("/")[1]; | ||
| // String pos = lineArr[2]; | ||
| // System.out.println(name+" "+type+" "+pos); | ||
| // double x = Double.parseDouble(pos.split(" ")[0]); | ||
| // double y = Double.parseDouble(pos.split(" ")[1]); | ||
| // double z = Double.parseDouble(pos.split(" ")[2]); | ||
| // | ||
| // Test test = Test.builder() | ||
| // .name(name) | ||
| // .xPos(x) | ||
| // .yPos(y) | ||
| // .zPos(z) | ||
| // .month(monthCheck) | ||
| // .day(dayCheck) | ||
| // .build(); | ||
| // | ||
| // test.toTypeEnum(type); | ||
| // testRepository.save(test); | ||
| // if((monthCheck == 1 || monthCheck == 3 || monthCheck == 5 || monthCheck == 7 | ||
| // || monthCheck == 8 || monthCheck == 10 || monthCheck ==12) && dayCheck == 31) { | ||
| // monthCheck++; | ||
| // dayCheck = 0; | ||
| // } | ||
| // else if(monthCheck == 2 && dayCheck == 29){ | ||
| // monthCheck++; | ||
| // dayCheck = 0; | ||
| // } | ||
| // else if((monthCheck == 4 || monthCheck == 6 || monthCheck ==9 || monthCheck == 11) && dayCheck == 30){ | ||
| // monthCheck++; | ||
| // dayCheck = 0; | ||
| // } | ||
| // dayCheck++; | ||
| // return test; | ||
| // }; | ||
| // } | ||
| // | ||
| //} | ||
| package com.example.goorm; | ||
|
|
||
| import com.example.goorm.oreum.file.CsvReader; | ||
| import com.example.goorm.oreum.file.CsvWriter; | ||
| import com.example.goorm.oreum.domain.Oreum; | ||
| import com.example.goorm.oreum.dto.CsvReaderDto; | ||
| import com.example.goorm.oreum.repository.OreumRepository; | ||
| import lombok.RequiredArgsConstructor; | ||
| import lombok.extern.slf4j.Slf4j; | ||
| import org.aspectj.weaver.ast.Test; | ||
| import org.springframework.batch.core.Job; | ||
| import org.springframework.batch.core.Step; | ||
| import org.springframework.batch.core.configuration.annotation.JobBuilderFactory; | ||
| import org.springframework.batch.core.configuration.annotation.StepBuilderFactory; | ||
| import org.springframework.batch.item.ItemProcessor; | ||
| import org.springframework.context.annotation.Bean; | ||
| import org.springframework.context.annotation.Configuration; | ||
|
|
||
| @Slf4j | ||
| @Configuration | ||
| @RequiredArgsConstructor | ||
| public class FileItemReaderJobConfig { | ||
| private final JobBuilderFactory jobBuilderFactory; | ||
| private final StepBuilderFactory stepBuilderFactory; | ||
|
|
||
| private final OreumRepository oreumRepository; | ||
| private final CsvReader csvReader; | ||
| private final CsvWriter csvWriter; | ||
|
|
||
| private static final int chunkSize = 366; | ||
|
|
||
| private static int monthCheck = 1; | ||
| private static int dayCheck = 1; | ||
|
|
||
| // csvFileItemReaderJob 라는 이름의 job 생성 | ||
| @Bean | ||
| public Job csvFileItemReaderJob() { | ||
| return jobBuilderFactory.get("csvFileItemReaderJob") | ||
| .start(csvFileItemReaderStep()) | ||
| .build(); | ||
| } | ||
|
|
||
| // csvFileItemReaderStep 이라는 이름의 Step 생성 | ||
| @Bean | ||
| public Step csvFileItemReaderStep() { | ||
| return stepBuilderFactory.get("csvFileItemReaderStep") | ||
| .<String, Test>chunk(chunkSize) | ||
| // Reader 에서 읽어올 타입 - String, Writer에 넘겨줄 타입이 Oreum | ||
| .reader(csvReader.csvFileItemReader()) // 일단 csv에서 String 읽기 | ||
| .processor(csvProcessor()) // String을 가공 | ||
| .writer(csvWriter) | ||
| .build(); | ||
| } | ||
| @Bean | ||
| public ItemProcessor<CsvReaderDto, Oreum> csvProcessor() { | ||
| return csvReaderDto -> { | ||
| String name = csvReaderDto.getName(); | ||
| String type = csvReaderDto.getType().split("/")[1]; | ||
| String pos = csvReaderDto.getPos(); | ||
| double x = Double.parseDouble(pos.split(" ")[0]); | ||
| double y = Double.parseDouble(pos.split(" ")[1]); | ||
| double z = Double.parseDouble(pos.split(" ")[2]); | ||
|
|
||
| Oreum oreum = Oreum.builder() | ||
| .name(name) | ||
| .xPos(x) | ||
| .yPos(y) | ||
| .zPos(z) | ||
| .month(monthCheck) | ||
| .day(dayCheck) | ||
| .build(); | ||
|
|
||
| oreum.toTypeEnum(type); | ||
| oreumRepository.save(oreum); | ||
| if((monthCheck == 1 || monthCheck == 3 || monthCheck == 5 || monthCheck == 7 | ||
| || monthCheck == 8 || monthCheck == 10 || monthCheck ==12) && dayCheck == 31) { | ||
| monthCheck++; | ||
| dayCheck = 0; | ||
| } | ||
| else if(monthCheck == 2 && dayCheck == 29){ | ||
| monthCheck++; | ||
| dayCheck = 0; | ||
| } | ||
| else if((monthCheck == 4 || monthCheck == 6 || monthCheck ==9 || monthCheck == 11) && dayCheck == 30){ | ||
| monthCheck++; | ||
| dayCheck = 0; | ||
| } | ||
| dayCheck++; | ||
| return oreum; | ||
| }; | ||
| } | ||
|
|
||
| } |
This file was deleted.
Oops, something went wrong.
This file was deleted.
Oops, something went wrong.
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file was deleted.
Oops, something went wrong.
2 changes: 1 addition & 1 deletion
2
.../java/com/example/goorm/WebMvcConfig.java → ...mple/goorm/oreum/config/WebMvcConfig.java
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.