-
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
Showing
42 changed files
with
135 additions
and
132 deletions.
There are no files selected for viewing
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 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
5 changes: 3 additions & 2 deletions
5
.../java/ru/oil/ullage/dto/UllageMapper.java → ...main/java/ru/oil/mapper/UllageMapper.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
6 changes: 3 additions & 3 deletions
6
.../oil/ullageReport/UllageReportMapper.java → ...ava/ru/oil/mapper/UllageReportMapper.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
6 changes: 3 additions & 3 deletions
6
...n/java/ru/oil/utils/mapper/VcfMapper.java → ...rc/main/java/ru/oil/mapper/VcfMapper.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
6 changes: 3 additions & 3 deletions
6
...n/java/ru/oil/utils/mapper/WcfMapper.java → ...rc/main/java/ru/oil/mapper/WcfMapper.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
2 changes: 1 addition & 1 deletion
2
...r/src/main/java/ru/oil/units/api/Api.java → ...erver/src/main/java/ru/oil/model/Api.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,4 +1,4 @@ | ||
package ru.oil.units.api; | ||
package ru.oil.model; | ||
|
||
import lombok.AccessLevel; | ||
import lombok.Data; | ||
|
2 changes: 1 addition & 1 deletion
2
...ru/oil/units/temperature/Temperature.java → ...c/main/java/ru/oil/model/Temperature.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,4 +1,4 @@ | ||
package ru.oil.units.temperature; | ||
package ru.oil.model; | ||
|
||
import lombok.AccessLevel; | ||
import lombok.Data; | ||
|
2 changes: 1 addition & 1 deletion
2
...r/src/main/java/ru/oil/ullage/Ullage.java → ...er/src/main/java/ru/oil/model/Ullage.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,4 +1,4 @@ | ||
package ru.oil.ullage; | ||
package ru.oil.model; | ||
|
||
import lombok.AccessLevel; | ||
import lombok.Getter; | ||
|
4 changes: 2 additions & 2 deletions
4
.../oil/ullageReport/model/UllageReport.java → .../main/java/ru/oil/model/UllageReport.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
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 |
---|---|---|
@@ -0,0 +1,7 @@ | ||
package ru.oil.model; | ||
|
||
public interface Vcf { | ||
double getVcf(); | ||
Api getApi(); | ||
Temperature getTemp(); | ||
} |
4 changes: 1 addition & 3 deletions
4
...rc/main/java/ru/oil/units/vcf/Vcf54A.java → ...er/src/main/java/ru/oil/model/Vcf54A.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
4 changes: 1 addition & 3 deletions
4
...rc/main/java/ru/oil/units/vcf/Vcf54B.java → ...er/src/main/java/ru/oil/model/Vcf54B.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
2 changes: 1 addition & 1 deletion
2
.../src/main/java/ru/oil/units/vcf/Vcf6.java → ...rver/src/main/java/ru/oil/model/Vcf6.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,4 +1,4 @@ | ||
package ru.oil.units.vcf; | ||
package ru.oil.model; | ||
|
||
/** | ||
* TODO: | ||
|
4 changes: 1 addition & 3 deletions
4
...src/main/java/ru/oil/units/vcf/Vcf6A.java → ...ver/src/main/java/ru/oil/model/Vcf6A.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
4 changes: 1 addition & 3 deletions
4
...src/main/java/ru/oil/units/vcf/Vcf6B.java → ...ver/src/main/java/ru/oil/model/Vcf6B.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
4 changes: 1 addition & 3 deletions
4
...r/src/main/java/ru/oil/units/wcf/Wcf.java → ...erver/src/main/java/ru/oil/model/Wcf.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
3 changes: 2 additions & 1 deletion
3
...rc/main/java/ru/oil/units/api/ApiDto.java → ...rc/main/java/ru/oil/model/dto/ApiDto.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
3 changes: 2 additions & 1 deletion
3
...oil/units/temperature/TemperatureDto.java → ...java/ru/oil/model/dto/TemperatureDto.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
2 changes: 1 addition & 1 deletion
2
...ain/java/ru/oil/ullage/dto/UllageDto.java → ...main/java/ru/oil/model/dto/UllageDto.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,4 +1,4 @@ | ||
package ru.oil.ullage.dto; | ||
package ru.oil.model.dto; | ||
|
||
import lombok.AccessLevel; | ||
import lombok.Getter; | ||
|
6 changes: 3 additions & 3 deletions
6
...java/ru/oil/ullage/dto/UllageDtoFull.java → .../java/ru/oil/model/dto/UllageDtoFull.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
2 changes: 1 addition & 1 deletion
2
...l/ullageReport/model/UllageReportDto.java → ...ava/ru/oil/model/dto/UllageReportDto.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
2 changes: 1 addition & 1 deletion
2
...a/ru/oil/ullage/dto/UllageRequestDto.java → ...va/ru/oil/model/dto/UllageRequestDto.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,4 +1,4 @@ | ||
package ru.oil.ullage.dto; | ||
package ru.oil.model.dto; | ||
|
||
import ru.oil.enums.Tables; | ||
import lombok.*; | ||
|
2 changes: 1 addition & 1 deletion
2
.../main/java/ru/oil/utils/model/VcfDto.java → ...rc/main/java/ru/oil/model/dto/VcfDto.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
2 changes: 1 addition & 1 deletion
2
.../main/java/ru/oil/utils/model/WcfDto.java → ...rc/main/java/ru/oil/model/dto/WcfDto.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
3 changes: 2 additions & 1 deletion
3
.../java/ru/oil/ullage/UllageRepository.java → ...a/ru/oil/repository/UllageRepository.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
27 changes: 16 additions & 11 deletions
27
...oil/ullageReport/UllageReportService.java → ...a/ru/oil/service/UllageReportService.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
16 changes: 9 additions & 7 deletions
16
...ain/java/ru/oil/ullage/UllageService.java → ...in/java/ru/oil/service/UllageService.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
16 changes: 10 additions & 6 deletions
16
...java/ru/oil/utils/service/VcfService.java → .../main/java/ru/oil/service/VcfService.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
11 changes: 6 additions & 5 deletions
11
...java/ru/oil/utils/service/WcfService.java → .../main/java/ru/oil/service/WcfService.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
6 changes: 3 additions & 3 deletions
6
...il/ullageReport/IUllageReportService.java → ...vice/interfaces/IUllageReportService.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
10 changes: 10 additions & 0 deletions
10
crude-server/src/main/java/ru/oil/service/interfaces/IUllageService.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 |
---|---|---|
@@ -0,0 +1,10 @@ | ||
package ru.oil.service.interfaces; | ||
|
||
import ru.oil.model.dto.UllageDto; | ||
import ru.oil.model.dto.UllageRequestDto; | ||
|
||
public interface IUllageService { | ||
|
||
UllageDto getTankUllage(UllageRequestDto requestDto); | ||
|
||
} |
4 changes: 2 additions & 2 deletions
4
...ava/ru/oil/utils/service/IVcfService.java → ...u/oil/service/interfaces/IVcfService.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
10 changes: 10 additions & 0 deletions
10
crude-server/src/main/java/ru/oil/service/interfaces/IWcfService.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 |
---|---|---|
@@ -0,0 +1,10 @@ | ||
package ru.oil.service.interfaces; | ||
|
||
import ru.oil.model.dto.WcfDto; | ||
|
||
public interface IWcfService { | ||
|
||
WcfDto getWcf(double api); | ||
|
||
WcfDto getWcfByDensity(double density); | ||
} |
Oops, something went wrong.