diff --git a/crude-server/src/main/java/ru/oil/cargo/CargoMapper.java b/crude-server/src/main/java/ru/oil/cargo/CargoMapper.java index 8705526..a2a9c4d 100644 --- a/crude-server/src/main/java/ru/oil/cargo/CargoMapper.java +++ b/crude-server/src/main/java/ru/oil/cargo/CargoMapper.java @@ -1,10 +1,10 @@ package ru.oil.cargo; import ru.oil.cargo.dto.CargoDto; -import ru.oil.units.api.Api; -import ru.oil.units.api.ApiDto; -import ru.oil.units.temperature.Temperature; -import ru.oil.units.temperature.TemperatureDto; +import ru.oil.model.Api; +import ru.oil.model.dto.ApiDto; +import ru.oil.model.Temperature; +import ru.oil.model.dto.TemperatureDto; public class CargoMapper { diff --git a/crude-server/src/main/java/ru/oil/cargo/CargoService.java b/crude-server/src/main/java/ru/oil/cargo/CargoService.java index 558dac2..8f08c24 100644 --- a/crude-server/src/main/java/ru/oil/cargo/CargoService.java +++ b/crude-server/src/main/java/ru/oil/cargo/CargoService.java @@ -4,8 +4,8 @@ import org.springframework.stereotype.Service; import ru.oil.cargo.dto.CargoDto; import ru.oil.enums.CargoType; -import ru.oil.units.api.Api; -import ru.oil.units.temperature.Temperature; +import ru.oil.model.Api; +import ru.oil.model.Temperature; import java.util.List; import java.util.NoSuchElementException; diff --git a/crude-server/src/main/java/ru/oil/cargo/dto/CargoDto.java b/crude-server/src/main/java/ru/oil/cargo/dto/CargoDto.java index d0664d4..fc4d07c 100644 --- a/crude-server/src/main/java/ru/oil/cargo/dto/CargoDto.java +++ b/crude-server/src/main/java/ru/oil/cargo/dto/CargoDto.java @@ -6,8 +6,8 @@ import lombok.Setter; import lombok.experimental.FieldDefaults; import ru.oil.enums.CargoType; -import ru.oil.units.api.ApiDto; -import ru.oil.units.temperature.TemperatureDto; +import ru.oil.model.dto.ApiDto; +import ru.oil.model.dto.TemperatureDto; import javax.validation.constraints.NotNull; @Getter diff --git a/crude-server/src/main/java/ru/oil/ullage/dto/UllageMapper.java b/crude-server/src/main/java/ru/oil/mapper/UllageMapper.java similarity index 82% rename from crude-server/src/main/java/ru/oil/ullage/dto/UllageMapper.java rename to crude-server/src/main/java/ru/oil/mapper/UllageMapper.java index 9980dce..6a01b54 100644 --- a/crude-server/src/main/java/ru/oil/ullage/dto/UllageMapper.java +++ b/crude-server/src/main/java/ru/oil/mapper/UllageMapper.java @@ -1,6 +1,7 @@ -package ru.oil.ullage.dto; +package ru.oil.mapper; -import ru.oil.ullage.Ullage; +import ru.oil.model.Ullage; +import ru.oil.model.dto.UllageDto; public class UllageMapper { diff --git a/crude-server/src/main/java/ru/oil/ullageReport/UllageReportMapper.java b/crude-server/src/main/java/ru/oil/mapper/UllageReportMapper.java similarity index 82% rename from crude-server/src/main/java/ru/oil/ullageReport/UllageReportMapper.java rename to crude-server/src/main/java/ru/oil/mapper/UllageReportMapper.java index a1edf6f..31c22fe 100644 --- a/crude-server/src/main/java/ru/oil/ullageReport/UllageReportMapper.java +++ b/crude-server/src/main/java/ru/oil/mapper/UllageReportMapper.java @@ -1,7 +1,7 @@ -package ru.oil.ullageReport; +package ru.oil.mapper; -import ru.oil.ullageReport.model.UllageReport; -import ru.oil.ullageReport.model.UllageReportDto; +import ru.oil.model.UllageReport; +import ru.oil.model.dto.UllageReportDto; public class UllageReportMapper { diff --git a/crude-server/src/main/java/ru/oil/utils/mapper/VcfMapper.java b/crude-server/src/main/java/ru/oil/mapper/VcfMapper.java similarity index 57% rename from crude-server/src/main/java/ru/oil/utils/mapper/VcfMapper.java rename to crude-server/src/main/java/ru/oil/mapper/VcfMapper.java index 1f9e872..2899ac3 100644 --- a/crude-server/src/main/java/ru/oil/utils/mapper/VcfMapper.java +++ b/crude-server/src/main/java/ru/oil/mapper/VcfMapper.java @@ -1,7 +1,7 @@ -package ru.oil.utils.mapper; +package ru.oil.mapper; -import ru.oil.units.vcf.Vcf; -import ru.oil.utils.model.VcfDto; +import ru.oil.model.Vcf; +import ru.oil.model.dto.VcfDto; public class VcfMapper { diff --git a/crude-server/src/main/java/ru/oil/utils/mapper/WcfMapper.java b/crude-server/src/main/java/ru/oil/mapper/WcfMapper.java similarity index 62% rename from crude-server/src/main/java/ru/oil/utils/mapper/WcfMapper.java rename to crude-server/src/main/java/ru/oil/mapper/WcfMapper.java index ba4f66c..7179334 100644 --- a/crude-server/src/main/java/ru/oil/utils/mapper/WcfMapper.java +++ b/crude-server/src/main/java/ru/oil/mapper/WcfMapper.java @@ -1,7 +1,7 @@ -package ru.oil.utils.mapper; +package ru.oil.mapper; -import ru.oil.units.wcf.Wcf; -import ru.oil.utils.model.WcfDto; +import ru.oil.model.Wcf; +import ru.oil.model.dto.WcfDto; public class WcfMapper { diff --git a/crude-server/src/main/java/ru/oil/units/api/Api.java b/crude-server/src/main/java/ru/oil/model/Api.java similarity index 98% rename from crude-server/src/main/java/ru/oil/units/api/Api.java rename to crude-server/src/main/java/ru/oil/model/Api.java index 02f5f98..097f486 100644 --- a/crude-server/src/main/java/ru/oil/units/api/Api.java +++ b/crude-server/src/main/java/ru/oil/model/Api.java @@ -1,4 +1,4 @@ -package ru.oil.units.api; +package ru.oil.model; import lombok.AccessLevel; import lombok.Data; diff --git a/crude-server/src/main/java/ru/oil/units/temperature/Temperature.java b/crude-server/src/main/java/ru/oil/model/Temperature.java similarity index 95% rename from crude-server/src/main/java/ru/oil/units/temperature/Temperature.java rename to crude-server/src/main/java/ru/oil/model/Temperature.java index bfd6f02..e4c508c 100644 --- a/crude-server/src/main/java/ru/oil/units/temperature/Temperature.java +++ b/crude-server/src/main/java/ru/oil/model/Temperature.java @@ -1,4 +1,4 @@ -package ru.oil.units.temperature; +package ru.oil.model; import lombok.AccessLevel; import lombok.Data; diff --git a/crude-server/src/main/java/ru/oil/ullage/Ullage.java b/crude-server/src/main/java/ru/oil/model/Ullage.java similarity index 97% rename from crude-server/src/main/java/ru/oil/ullage/Ullage.java rename to crude-server/src/main/java/ru/oil/model/Ullage.java index 3a10b12..833a037 100644 --- a/crude-server/src/main/java/ru/oil/ullage/Ullage.java +++ b/crude-server/src/main/java/ru/oil/model/Ullage.java @@ -1,4 +1,4 @@ -package ru.oil.ullage; +package ru.oil.model; import lombok.AccessLevel; import lombok.Getter; diff --git a/crude-server/src/main/java/ru/oil/ullageReport/model/UllageReport.java b/crude-server/src/main/java/ru/oil/model/UllageReport.java similarity index 80% rename from crude-server/src/main/java/ru/oil/ullageReport/model/UllageReport.java rename to crude-server/src/main/java/ru/oil/model/UllageReport.java index eeb04b6..e13f5fb 100644 --- a/crude-server/src/main/java/ru/oil/ullageReport/model/UllageReport.java +++ b/crude-server/src/main/java/ru/oil/model/UllageReport.java @@ -1,9 +1,9 @@ -package ru.oil.ullageReport.model; +package ru.oil.model; import ru.oil.cargo.dto.CargoDto; -import ru.oil.ullage.dto.UllageDtoFull; import lombok.*; import lombok.experimental.FieldDefaults; +import ru.oil.model.dto.UllageDtoFull; @Getter @Setter diff --git a/crude-server/src/main/java/ru/oil/model/Vcf.java b/crude-server/src/main/java/ru/oil/model/Vcf.java new file mode 100644 index 0000000..492a737 --- /dev/null +++ b/crude-server/src/main/java/ru/oil/model/Vcf.java @@ -0,0 +1,7 @@ +package ru.oil.model; + +public interface Vcf { + double getVcf(); + Api getApi(); + Temperature getTemp(); +} diff --git a/crude-server/src/main/java/ru/oil/units/vcf/Vcf54A.java b/crude-server/src/main/java/ru/oil/model/Vcf54A.java similarity index 90% rename from crude-server/src/main/java/ru/oil/units/vcf/Vcf54A.java rename to crude-server/src/main/java/ru/oil/model/Vcf54A.java index 20641e8..8d609dd 100644 --- a/crude-server/src/main/java/ru/oil/units/vcf/Vcf54A.java +++ b/crude-server/src/main/java/ru/oil/model/Vcf54A.java @@ -1,7 +1,5 @@ -package ru.oil.units.vcf; +package ru.oil.model; -import ru.oil.units.api.Api; -import ru.oil.units.temperature.Temperature; import lombok.Data; @Data diff --git a/crude-server/src/main/java/ru/oil/units/vcf/Vcf54B.java b/crude-server/src/main/java/ru/oil/model/Vcf54B.java similarity index 94% rename from crude-server/src/main/java/ru/oil/units/vcf/Vcf54B.java rename to crude-server/src/main/java/ru/oil/model/Vcf54B.java index 5af2e35..c87a9c1 100644 --- a/crude-server/src/main/java/ru/oil/units/vcf/Vcf54B.java +++ b/crude-server/src/main/java/ru/oil/model/Vcf54B.java @@ -1,7 +1,5 @@ -package ru.oil.units.vcf; +package ru.oil.model; -import ru.oil.units.api.Api; -import ru.oil.units.temperature.Temperature; import lombok.*; import lombok.experimental.FieldDefaults; import lombok.experimental.NonFinal; diff --git a/crude-server/src/main/java/ru/oil/units/vcf/Vcf6.java b/crude-server/src/main/java/ru/oil/model/Vcf6.java similarity index 70% rename from crude-server/src/main/java/ru/oil/units/vcf/Vcf6.java rename to crude-server/src/main/java/ru/oil/model/Vcf6.java index 3869fd6..511ed8e 100644 --- a/crude-server/src/main/java/ru/oil/units/vcf/Vcf6.java +++ b/crude-server/src/main/java/ru/oil/model/Vcf6.java @@ -1,4 +1,4 @@ -package ru.oil.units.vcf; +package ru.oil.model; /** * TODO: diff --git a/crude-server/src/main/java/ru/oil/units/vcf/Vcf6A.java b/crude-server/src/main/java/ru/oil/model/Vcf6A.java similarity index 90% rename from crude-server/src/main/java/ru/oil/units/vcf/Vcf6A.java rename to crude-server/src/main/java/ru/oil/model/Vcf6A.java index 5dee515..bd8caaf 100644 --- a/crude-server/src/main/java/ru/oil/units/vcf/Vcf6A.java +++ b/crude-server/src/main/java/ru/oil/model/Vcf6A.java @@ -1,7 +1,5 @@ -package ru.oil.units.vcf; +package ru.oil.model; -import ru.oil.units.api.Api; -import ru.oil.units.temperature.Temperature; import lombok.Data; @Data diff --git a/crude-server/src/main/java/ru/oil/units/vcf/Vcf6B.java b/crude-server/src/main/java/ru/oil/model/Vcf6B.java similarity index 94% rename from crude-server/src/main/java/ru/oil/units/vcf/Vcf6B.java rename to crude-server/src/main/java/ru/oil/model/Vcf6B.java index b5fe14b..8d7a814 100644 --- a/crude-server/src/main/java/ru/oil/units/vcf/Vcf6B.java +++ b/crude-server/src/main/java/ru/oil/model/Vcf6B.java @@ -1,7 +1,5 @@ -package ru.oil.units.vcf; +package ru.oil.model; -import ru.oil.units.api.Api; -import ru.oil.units.temperature.Temperature; import lombok.Getter; import lombok.RequiredArgsConstructor; import lombok.Setter; diff --git a/crude-server/src/main/java/ru/oil/units/wcf/Wcf.java b/crude-server/src/main/java/ru/oil/model/Wcf.java similarity index 90% rename from crude-server/src/main/java/ru/oil/units/wcf/Wcf.java rename to crude-server/src/main/java/ru/oil/model/Wcf.java index f95f447..c622eae 100644 --- a/crude-server/src/main/java/ru/oil/units/wcf/Wcf.java +++ b/crude-server/src/main/java/ru/oil/model/Wcf.java @@ -1,8 +1,6 @@ -package ru.oil.units.wcf; +package ru.oil.model; import lombok.AllArgsConstructor; -import ru.oil.units.vcf.Vcf; -import lombok.RequiredArgsConstructor; @AllArgsConstructor(staticName = "create") public class Wcf { diff --git a/crude-server/src/main/java/ru/oil/units/api/ApiDto.java b/crude-server/src/main/java/ru/oil/model/dto/ApiDto.java similarity index 91% rename from crude-server/src/main/java/ru/oil/units/api/ApiDto.java rename to crude-server/src/main/java/ru/oil/model/dto/ApiDto.java index 5c7332b..6d06430 100644 --- a/crude-server/src/main/java/ru/oil/units/api/ApiDto.java +++ b/crude-server/src/main/java/ru/oil/model/dto/ApiDto.java @@ -1,7 +1,8 @@ -package ru.oil.units.api; +package ru.oil.model.dto; import lombok.*; import lombok.experimental.FieldDefaults; +import ru.oil.model.Api; @RequiredArgsConstructor(staticName = "create") @AllArgsConstructor(staticName = "create") diff --git a/crude-server/src/main/java/ru/oil/units/temperature/TemperatureDto.java b/crude-server/src/main/java/ru/oil/model/dto/TemperatureDto.java similarity index 91% rename from crude-server/src/main/java/ru/oil/units/temperature/TemperatureDto.java rename to crude-server/src/main/java/ru/oil/model/dto/TemperatureDto.java index 39e766f..252e968 100644 --- a/crude-server/src/main/java/ru/oil/units/temperature/TemperatureDto.java +++ b/crude-server/src/main/java/ru/oil/model/dto/TemperatureDto.java @@ -1,7 +1,8 @@ -package ru.oil.units.temperature; +package ru.oil.model.dto; import lombok.*; import lombok.experimental.FieldDefaults; +import ru.oil.model.Temperature; @RequiredArgsConstructor @AllArgsConstructor(staticName = "create") diff --git a/crude-server/src/main/java/ru/oil/ullage/dto/UllageDto.java b/crude-server/src/main/java/ru/oil/model/dto/UllageDto.java similarity index 94% rename from crude-server/src/main/java/ru/oil/ullage/dto/UllageDto.java rename to crude-server/src/main/java/ru/oil/model/dto/UllageDto.java index c9d4a94..cf86856 100644 --- a/crude-server/src/main/java/ru/oil/ullage/dto/UllageDto.java +++ b/crude-server/src/main/java/ru/oil/model/dto/UllageDto.java @@ -1,4 +1,4 @@ -package ru.oil.ullage.dto; +package ru.oil.model.dto; import lombok.AccessLevel; import lombok.Getter; diff --git a/crude-server/src/main/java/ru/oil/ullage/dto/UllageDtoFull.java b/crude-server/src/main/java/ru/oil/model/dto/UllageDtoFull.java similarity index 81% rename from crude-server/src/main/java/ru/oil/ullage/dto/UllageDtoFull.java rename to crude-server/src/main/java/ru/oil/model/dto/UllageDtoFull.java index 9a0462b..a613f22 100644 --- a/crude-server/src/main/java/ru/oil/ullage/dto/UllageDtoFull.java +++ b/crude-server/src/main/java/ru/oil/model/dto/UllageDtoFull.java @@ -1,7 +1,7 @@ -package ru.oil.ullage.dto; +package ru.oil.model.dto; -import ru.oil.units.api.Api; -import ru.oil.units.temperature.Temperature; +import ru.oil.model.Api; +import ru.oil.model.Temperature; import lombok.*; import lombok.experimental.FieldDefaults; diff --git a/crude-server/src/main/java/ru/oil/ullageReport/model/UllageReportDto.java b/crude-server/src/main/java/ru/oil/model/dto/UllageReportDto.java similarity index 91% rename from crude-server/src/main/java/ru/oil/ullageReport/model/UllageReportDto.java rename to crude-server/src/main/java/ru/oil/model/dto/UllageReportDto.java index d90d0fa..a963b91 100644 --- a/crude-server/src/main/java/ru/oil/ullageReport/model/UllageReportDto.java +++ b/crude-server/src/main/java/ru/oil/model/dto/UllageReportDto.java @@ -1,4 +1,4 @@ -package ru.oil.ullageReport.model; +package ru.oil.model.dto; import lombok.*; import lombok.experimental.FieldDefaults; diff --git a/crude-server/src/main/java/ru/oil/ullage/dto/UllageRequestDto.java b/crude-server/src/main/java/ru/oil/model/dto/UllageRequestDto.java similarity index 94% rename from crude-server/src/main/java/ru/oil/ullage/dto/UllageRequestDto.java rename to crude-server/src/main/java/ru/oil/model/dto/UllageRequestDto.java index 30430d3..f6c414b 100644 --- a/crude-server/src/main/java/ru/oil/ullage/dto/UllageRequestDto.java +++ b/crude-server/src/main/java/ru/oil/model/dto/UllageRequestDto.java @@ -1,4 +1,4 @@ -package ru.oil.ullage.dto; +package ru.oil.model.dto; import ru.oil.enums.Tables; import lombok.*; diff --git a/crude-server/src/main/java/ru/oil/utils/model/VcfDto.java b/crude-server/src/main/java/ru/oil/model/dto/VcfDto.java similarity index 91% rename from crude-server/src/main/java/ru/oil/utils/model/VcfDto.java rename to crude-server/src/main/java/ru/oil/model/dto/VcfDto.java index 59b186f..276118f 100644 --- a/crude-server/src/main/java/ru/oil/utils/model/VcfDto.java +++ b/crude-server/src/main/java/ru/oil/model/dto/VcfDto.java @@ -1,4 +1,4 @@ -package ru.oil.utils.model; +package ru.oil.model.dto; import lombok.AccessLevel; import lombok.AllArgsConstructor; diff --git a/crude-server/src/main/java/ru/oil/utils/model/WcfDto.java b/crude-server/src/main/java/ru/oil/model/dto/WcfDto.java similarity index 92% rename from crude-server/src/main/java/ru/oil/utils/model/WcfDto.java rename to crude-server/src/main/java/ru/oil/model/dto/WcfDto.java index 8481b58..f97d99d 100644 --- a/crude-server/src/main/java/ru/oil/utils/model/WcfDto.java +++ b/crude-server/src/main/java/ru/oil/model/dto/WcfDto.java @@ -1,4 +1,4 @@ -package ru.oil.utils.model; +package ru.oil.model.dto; import lombok.AccessLevel; import lombok.AllArgsConstructor; diff --git a/crude-server/src/main/java/ru/oil/ullage/UllageRepository.java b/crude-server/src/main/java/ru/oil/repository/UllageRepository.java similarity index 92% rename from crude-server/src/main/java/ru/oil/ullage/UllageRepository.java rename to crude-server/src/main/java/ru/oil/repository/UllageRepository.java index b88d8a1..d8d8f32 100644 --- a/crude-server/src/main/java/ru/oil/ullage/UllageRepository.java +++ b/crude-server/src/main/java/ru/oil/repository/UllageRepository.java @@ -1,4 +1,4 @@ -package ru.oil.ullage; +package ru.oil.repository; import org.springframework.data.domain.Pageable; import org.springframework.data.jpa.repository.JpaRepository; @@ -6,6 +6,7 @@ import org.springframework.stereotype.Repository; import java.util.List; +import ru.oil.model.Ullage; @Repository public interface UllageRepository extends JpaRepository { diff --git a/crude-server/src/main/java/ru/oil/ullageReport/UllageReportService.java b/crude-server/src/main/java/ru/oil/service/UllageReportService.java similarity index 90% rename from crude-server/src/main/java/ru/oil/ullageReport/UllageReportService.java rename to crude-server/src/main/java/ru/oil/service/UllageReportService.java index 7759478..6237e59 100644 --- a/crude-server/src/main/java/ru/oil/ullageReport/UllageReportService.java +++ b/crude-server/src/main/java/ru/oil/service/UllageReportService.java @@ -1,4 +1,4 @@ -package ru.oil.ullageReport; +package ru.oil.service; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.lang.Nullable; @@ -6,16 +6,21 @@ import ru.oil.cargo.CargoService; import ru.oil.cargo.dto.CargoDto; import ru.oil.enums.Tables; -import ru.oil.ullage.UllageService; -import ru.oil.ullage.dto.UllageDto; -import ru.oil.ullage.dto.UllageDtoFull; -import ru.oil.ullage.dto.UllageRequestDto; -import ru.oil.ullageReport.model.UllageReport; -import ru.oil.ullageReport.model.UllageReportDto; -import ru.oil.units.api.Api; -import ru.oil.units.temperature.Temperature; -import ru.oil.units.vcf.*; -import ru.oil.units.wcf.Wcf; +import ru.oil.model.Vcf; +import ru.oil.model.Vcf54A; +import ru.oil.model.Vcf54B; +import ru.oil.model.Vcf6A; +import ru.oil.model.Vcf6B; +import ru.oil.model.dto.UllageDto; +import ru.oil.model.dto.UllageDtoFull; +import ru.oil.model.dto.UllageRequestDto; +import ru.oil.service.interfaces.IUllageReportService; +import ru.oil.mapper.UllageReportMapper; +import ru.oil.model.UllageReport; +import ru.oil.model.dto.UllageReportDto; +import ru.oil.model.Api; +import ru.oil.model.Temperature; +import ru.oil.model.Wcf; import java.util.ArrayList; import java.util.List; diff --git a/crude-server/src/main/java/ru/oil/ullage/UllageService.java b/crude-server/src/main/java/ru/oil/service/UllageService.java similarity index 94% rename from crude-server/src/main/java/ru/oil/ullage/UllageService.java rename to crude-server/src/main/java/ru/oil/service/UllageService.java index bf2dfc1..65b6b3a 100644 --- a/crude-server/src/main/java/ru/oil/ullage/UllageService.java +++ b/crude-server/src/main/java/ru/oil/service/UllageService.java @@ -1,15 +1,17 @@ -package ru.oil.ullage; +package ru.oil.service; -import ru.oil.ullage.dto.UllageDto; -import ru.oil.ullage.dto.UllageMapper; -import ru.oil.ullage.dto.UllageRequestDto; +import java.util.List; +import java.util.NoSuchElementException; import lombok.RequiredArgsConstructor; import org.springframework.data.domain.PageRequest; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; - -import java.util.List; -import java.util.NoSuchElementException; +import ru.oil.repository.UllageRepository; +import ru.oil.model.Ullage; +import ru.oil.model.dto.UllageDto; +import ru.oil.mapper.UllageMapper; +import ru.oil.model.dto.UllageRequestDto; +import ru.oil.service.interfaces.IUllageService; @Service @RequiredArgsConstructor diff --git a/crude-server/src/main/java/ru/oil/utils/service/VcfService.java b/crude-server/src/main/java/ru/oil/service/VcfService.java similarity index 78% rename from crude-server/src/main/java/ru/oil/utils/service/VcfService.java rename to crude-server/src/main/java/ru/oil/service/VcfService.java index cd01c8d..a29f6ce 100644 --- a/crude-server/src/main/java/ru/oil/utils/service/VcfService.java +++ b/crude-server/src/main/java/ru/oil/service/VcfService.java @@ -1,13 +1,17 @@ -package ru.oil.utils.service; +package ru.oil.service; import org.springframework.stereotype.Service; import ru.oil.enums.Tables; import ru.oil.exception.UtilsException; -import ru.oil.units.api.Api; -import ru.oil.units.temperature.Temperature; -import ru.oil.units.vcf.*; -import ru.oil.utils.mapper.VcfMapper; -import ru.oil.utils.model.VcfDto; +import ru.oil.model.Vcf54A; +import ru.oil.model.Vcf54B; +import ru.oil.model.Vcf6A; +import ru.oil.model.Vcf6B; +import ru.oil.service.interfaces.IVcfService; +import ru.oil.model.Api; +import ru.oil.model.Temperature; +import ru.oil.mapper.VcfMapper; +import ru.oil.model.dto.VcfDto; @Service public class VcfService implements IVcfService { diff --git a/crude-server/src/main/java/ru/oil/utils/service/WcfService.java b/crude-server/src/main/java/ru/oil/service/WcfService.java similarity index 68% rename from crude-server/src/main/java/ru/oil/utils/service/WcfService.java rename to crude-server/src/main/java/ru/oil/service/WcfService.java index 4fa4ab2..20e2ab1 100644 --- a/crude-server/src/main/java/ru/oil/utils/service/WcfService.java +++ b/crude-server/src/main/java/ru/oil/service/WcfService.java @@ -1,10 +1,11 @@ -package ru.oil.utils.service; +package ru.oil.service; import org.springframework.stereotype.Service; -import ru.oil.units.api.Api; -import ru.oil.units.wcf.Wcf; -import ru.oil.utils.mapper.WcfMapper; -import ru.oil.utils.model.WcfDto; +import ru.oil.service.interfaces.IWcfService; +import ru.oil.model.Api; +import ru.oil.model.Wcf; +import ru.oil.mapper.WcfMapper; +import ru.oil.model.dto.WcfDto; @Service public class WcfService implements IWcfService { diff --git a/crude-server/src/main/java/ru/oil/ullageReport/IUllageReportService.java b/crude-server/src/main/java/ru/oil/service/interfaces/IUllageReportService.java similarity index 56% rename from crude-server/src/main/java/ru/oil/ullageReport/IUllageReportService.java rename to crude-server/src/main/java/ru/oil/service/interfaces/IUllageReportService.java index 08e49d9..a51f124 100644 --- a/crude-server/src/main/java/ru/oil/ullageReport/IUllageReportService.java +++ b/crude-server/src/main/java/ru/oil/service/interfaces/IUllageReportService.java @@ -1,7 +1,7 @@ -package ru.oil.ullageReport; +package ru.oil.service.interfaces; -import ru.oil.ullage.dto.UllageRequestDto; -import ru.oil.ullageReport.model.UllageReportDto; +import ru.oil.model.dto.UllageRequestDto; +import ru.oil.model.dto.UllageReportDto; import java.util.List; diff --git a/crude-server/src/main/java/ru/oil/service/interfaces/IUllageService.java b/crude-server/src/main/java/ru/oil/service/interfaces/IUllageService.java new file mode 100644 index 0000000..64caa94 --- /dev/null +++ b/crude-server/src/main/java/ru/oil/service/interfaces/IUllageService.java @@ -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); + +} diff --git a/crude-server/src/main/java/ru/oil/utils/service/IVcfService.java b/crude-server/src/main/java/ru/oil/service/interfaces/IVcfService.java similarity index 70% rename from crude-server/src/main/java/ru/oil/utils/service/IVcfService.java rename to crude-server/src/main/java/ru/oil/service/interfaces/IVcfService.java index ac221ce..9b06de2 100644 --- a/crude-server/src/main/java/ru/oil/utils/service/IVcfService.java +++ b/crude-server/src/main/java/ru/oil/service/interfaces/IVcfService.java @@ -1,7 +1,7 @@ -package ru.oil.utils.service; +package ru.oil.service.interfaces; import ru.oil.enums.Tables; -import ru.oil.utils.model.VcfDto; +import ru.oil.model.dto.VcfDto; public interface IVcfService { diff --git a/crude-server/src/main/java/ru/oil/service/interfaces/IWcfService.java b/crude-server/src/main/java/ru/oil/service/interfaces/IWcfService.java new file mode 100644 index 0000000..c20d450 --- /dev/null +++ b/crude-server/src/main/java/ru/oil/service/interfaces/IWcfService.java @@ -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); +} diff --git a/crude-server/src/main/java/ru/oil/ullage/IUllageService.java b/crude-server/src/main/java/ru/oil/ullage/IUllageService.java deleted file mode 100644 index 8a4d604..0000000 --- a/crude-server/src/main/java/ru/oil/ullage/IUllageService.java +++ /dev/null @@ -1,10 +0,0 @@ -package ru.oil.ullage; - -import ru.oil.ullage.dto.UllageDto; -import ru.oil.ullage.dto.UllageRequestDto; - -public interface IUllageService { - - UllageDto getTankUllage(UllageRequestDto requestDto); - -} diff --git a/crude-server/src/main/java/ru/oil/units/vcf/Vcf.java b/crude-server/src/main/java/ru/oil/units/vcf/Vcf.java deleted file mode 100644 index 8874190..0000000 --- a/crude-server/src/main/java/ru/oil/units/vcf/Vcf.java +++ /dev/null @@ -1,10 +0,0 @@ -package ru.oil.units.vcf; - -import ru.oil.units.api.Api; -import ru.oil.units.temperature.Temperature; - -public interface Vcf { - double getVcf(); - Api getApi(); - Temperature getTemp(); -} diff --git a/crude-server/src/main/java/ru/oil/utils/service/IWcfService.java b/crude-server/src/main/java/ru/oil/utils/service/IWcfService.java deleted file mode 100644 index ec5b6dd..0000000 --- a/crude-server/src/main/java/ru/oil/utils/service/IWcfService.java +++ /dev/null @@ -1,12 +0,0 @@ -package ru.oil.utils.service; - -import ru.oil.units.api.Api; -import ru.oil.units.wcf.Wcf; -import ru.oil.utils.model.WcfDto; - -public interface IWcfService { - - WcfDto getWcf(double api); - - WcfDto getWcfByDensity(double density); -} diff --git a/crude-server/src/main/java/ru/oil/ullage/UllageController.java b/crude-server/src/main/java/ru/oil/web/controller/UllageController.java similarity index 78% rename from crude-server/src/main/java/ru/oil/ullage/UllageController.java rename to crude-server/src/main/java/ru/oil/web/controller/UllageController.java index c480303..4ade56c 100644 --- a/crude-server/src/main/java/ru/oil/ullage/UllageController.java +++ b/crude-server/src/main/java/ru/oil/web/controller/UllageController.java @@ -1,7 +1,8 @@ -package ru.oil.ullage; +package ru.oil.web.controller; -import ru.oil.ullage.dto.UllageDto; -import ru.oil.ullage.dto.UllageRequestDto; +import ru.oil.service.UllageService; +import ru.oil.model.dto.UllageDto; +import ru.oil.model.dto.UllageRequestDto; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.web.bind.annotation.*; diff --git a/crude-server/src/main/java/ru/oil/ullageReport/UllageReportController.java b/crude-server/src/main/java/ru/oil/web/controller/UllageReportController.java similarity index 77% rename from crude-server/src/main/java/ru/oil/ullageReport/UllageReportController.java rename to crude-server/src/main/java/ru/oil/web/controller/UllageReportController.java index e8247c5..b38798b 100644 --- a/crude-server/src/main/java/ru/oil/ullageReport/UllageReportController.java +++ b/crude-server/src/main/java/ru/oil/web/controller/UllageReportController.java @@ -1,9 +1,10 @@ -package ru.oil.ullageReport; +package ru.oil.web.controller; -import ru.oil.ullage.dto.UllageRequestDto; +import ru.oil.service.UllageReportService; +import ru.oil.model.dto.UllageRequestDto; import lombok.RequiredArgsConstructor; import org.springframework.web.bind.annotation.*; -import ru.oil.ullageReport.model.UllageReportDto; +import ru.oil.model.dto.UllageReportDto; import javax.validation.Valid; import java.util.List; diff --git a/crude-server/src/main/java/ru/oil/utils/UtilsController.java b/crude-server/src/main/java/ru/oil/web/controller/UtilsController.java similarity index 84% rename from crude-server/src/main/java/ru/oil/utils/UtilsController.java rename to crude-server/src/main/java/ru/oil/web/controller/UtilsController.java index 1290267..e74fbb4 100644 --- a/crude-server/src/main/java/ru/oil/utils/UtilsController.java +++ b/crude-server/src/main/java/ru/oil/web/controller/UtilsController.java @@ -1,12 +1,12 @@ -package ru.oil.utils; +package ru.oil.web.controller; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.web.bind.annotation.*; import ru.oil.enums.Tables; -import ru.oil.utils.model.VcfDto; -import ru.oil.utils.model.WcfDto; -import ru.oil.utils.service.VcfService; -import ru.oil.utils.service.WcfService; +import ru.oil.model.dto.VcfDto; +import ru.oil.model.dto.WcfDto; +import ru.oil.service.VcfService; +import ru.oil.service.WcfService; @RestController @RequestMapping("/utils") diff --git a/crude-server/src/main/resources/schema.sql b/crude-server/src/main/resources/schema.sql index 9bdf354..327fcbb 100644 --- a/crude-server/src/main/resources/schema.sql +++ b/crude-server/src/main/resources/schema.sql @@ -15,10 +15,10 @@ CREATE TABLE IF NOT EXISTS Cargo ( ID INT GENERATED BY DEFAULT AS IDENTITY PRIMARY KEY NOT NULL, NAME VARCHAR NOT NULL, TYPE VARCHAR NOT NULL, - API FLOAT NOT NULL, - DENSITY FLOAT NOT NULL, - TEMP_C FLOAT NOT NULL, - TEMP_F FLOAT NOT NULL + API FLOAT, + DENSITY FLOAT, + TEMP_C FLOAT, + TEMP_F FLOAT ); /*