Commit 30d08ad2 authored by Frank Dietrich's avatar Frank Dietrich
Browse files
parents b652666c 94568f2f
......@@ -2,4 +2,20 @@

mgfsBackendService/src/main/java/org/eclipse/openk/gridfailureinformation/config/DmzExportSchedulerConfig.java,b\2\b294790a0abf6e6345fdbe7b70e1480d994e4db9
d
4gfsBackendService/src/main/resources/application.yml,3\4\34d646736ecacfcbb8cb9909b3cdaa5e74530360
\ No newline at end of file
4gfsBackendService/src/main/resources/application.yml,3\4\34d646736ecacfcbb8cb9909b3cdaa5e74530360
z
JgfsBackendService/src/main/resources/db/migration/V0_46__CREATE_GFI_DB.sql,1\2\12d83cf53667985296308217bb938346ec30dfd0

laddressImport/src/test/java/org/eclipse/openk/gridfailureinformation/importadresses/jobs/JobManagerTest.java,3\5\35804fe8dc95851adec9d3eeabdd78ca650f3ac6
V
&gfsBackendService/Dockerfile_DevServer,f\5\f5b5d8322602fcae4be1013578986089a5e5acd0
I
gfsBackendService/pom.xml,b\8\b8d294268e747529c4155fac3bab551c65aeddba
^
.gfsBackendService/Dockerfile_DevServerUnsecure,7\d\7d1f11155aeaeedb6ca734ebe7ed60be35052252
y
IgfsBackendService/src/main/resources/db/migration/V0_1__CREATE_GFI_DB.sql,a\f\af976f53a5adee972a90cc8ade824991fc4ff366
z
JgfsBackendService/src/main/resources/db/migration/V0_47__CREATE_GFI_DB.sql,c\5\c52c239c5ea0f0e00ccafc87512d0617b22040de
S
#gfsBackendService/Dockerfile_Branch,f\9\f9b95f78c7148f2ae671235c95fa2726f710ce20
\ No newline at end of file
......@@ -83,7 +83,6 @@
<version>2.2.5.RELEASE</version>
</dependency>
<!-- https://mvnrepository.com/artifact/org.springframework.integration/spring-integration-sftp -->
<dependency>
<groupId>org.springframework.integration</groupId>
<artifactId>spring-integration-sftp</artifactId>
......
......@@ -61,7 +61,6 @@ public class ImportService {
ForeignFailureMessageDto foreignFailureMessageDto = createForeignFailureMessageDto(samoOutage);
log.info("ForeignFailureMessageDto created metaId: " + foreignFailureMessageDto.getMetaId());
log.info("Succeeded");
//pushForeignFailure(foreignFailureMessageDto);
} catch (JsonProcessingException e) {
log.error("Error parsing SAMOOutage", e);
}
......
......@@ -15,15 +15,23 @@
package org.eclipse.openk.gridfailureinformation.samointerface.service;
import com.fasterxml.jackson.databind.ObjectMapper;
import com.google.common.base.Charsets;
import com.google.common.io.Resources;
import org.apache.commons.io.FileUtils;
import org.eclipse.openk.gridfailureinformation.samointerface.SarisInterfaceApplication;
import org.eclipse.openk.gridfailureinformation.samointerface.config.TestConfiguration;
import org.junit.jupiter.api.Test;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.boot.test.context.SpringBootTest;
import org.springframework.boot.test.mock.mockito.MockBean;
import org.springframework.test.context.ActiveProfiles;
import org.springframework.test.context.ContextConfiguration;
import java.io.File;
import java.io.IOException;
import static org.junit.jupiter.api.Assertions.assertThrows;
import static org.junit.jupiter.api.Assertions.assertTrue;
import static org.mockito.ArgumentMatchers.any;
@SpringBootTest(classes = SarisInterfaceApplication.class)
......@@ -37,6 +45,19 @@ public class ImportServiceTest {
@Autowired
ObjectMapper objectMapper;
@Test
void shouldImportSAMOOutage() throws IOException {
String dateiname = "SAMO-ImportJsonFile.json";
File file = new File("src/test/resources/" + dateiname);
assertTrue(file.exists());
String demoOutag = FileUtils.readFileToString(file);
importService.importSAMOOutage(demoOutag);
}
/* @Test
public void shoulImportUserNotification() throws IOException {
......
......@@ -145,7 +145,21 @@
<artifactId>h2</artifactId>
<version>${h2.version}</version>
</dependency>
<dependency>
<groupId>com.oracle.database.jdbc</groupId>
<artifactId>ojdbc8</artifactId>
<version>19.6.0.0</version>
</dependency>
<dependency>
<groupId>com.oracle.database.jdbc</groupId>
<artifactId>ucp</artifactId>
<version>19.6.0.0</version>
</dependency>
<dependency>
<groupId>org.hibernate</groupId>
<artifactId>hibernate-core</artifactId>
<version>5.4.2.Final</version>
</dependency>
<dependency>
<groupId>com.rabbitmq</groupId>
<artifactId>amqp-client</artifactId>
......
package org.eclipse.openk.gridfailureinformation.importadresses.config;
import lombok.SneakyThrows;
import lombok.extern.log4j.Log4j2;
import oracle.ucp.jdbc.PoolDataSource;
import oracle.ucp.jdbc.PoolDataSourceFactory;
import org.springframework.beans.factory.annotation.Value;
import org.springframework.boot.autoconfigure.condition.ConditionalOnProperty;
import org.springframework.context.annotation.Bean;
import org.springframework.context.annotation.Configuration;
import org.springframework.context.annotation.Primary;
import javax.sql.DataSource;
import java.sql.SQLException;
@Log4j2
@Configuration
@ConditionalOnProperty(
value="spring.datasource.enable-oracle-configuration",
havingValue = "true",
matchIfMissing = false)
public class OracleConfig {
@Value("${spring.datasource.url}")
private String url;
@Value("${spring.datasource.username}")
private String username;
@Value("${spring.datasource.password}")
private String password;
@Value("${oracle.ucp.minPoolSize}")
private String minPoolSize;
@Value("${oracle.ucp.maxPoolSize}")
private String maxPoolSize;
@Value("${spring.datasource.driver-class-name:oracle.jdbc.pool.OracleDataSource}")
private String driverClassName;
@SneakyThrows
@Bean(name = "OracleUniversalConnectionPool")
@Primary
public DataSource getDataSource() {
PoolDataSource pds = null;
try {
pds = PoolDataSourceFactory.getPoolDataSource();
pds.setConnectionFactoryClassName(driverClassName);
pds.setURL(url);
pds.setUser(username);
pds.setPassword(password);
pds.setMinPoolSize(Integer.valueOf(minPoolSize));
pds.setInitialPoolSize(10);
pds.setMaxPoolSize(Integer.valueOf(maxPoolSize));
} catch (SQLException ea) {
log.error("Error connecting to the database: " + ea.getMessage());
}
return pds;
}
}
\ No newline at end of file
......@@ -22,10 +22,11 @@ import java.util.UUID;
@Data
@Entity
@Table(name = "TBL_GFI_ADDRESS")
public class TblAddress {
@Id
@GeneratedValue(strategy = GenerationType.SEQUENCE, generator = "tbl_address_id_seq")
@SequenceGenerator(name = "tbl_address_id_seq", sequenceName = "tbl_address_id_seq", allocationSize = 1)
@GeneratedValue(strategy = GenerationType.SEQUENCE, generator = "TBL_GFI_ADDRESS_ID_SEQ")
@SequenceGenerator(name = "TBL_GFI_ADDRESS_ID_SEQ", sequenceName = "TBL_GFI_ADDRESS_ID_SEQ", allocationSize = 1)
@Column(name = "id", updatable = false)
private Long id;
private UUID uuid;
......
......@@ -12,9 +12,25 @@
# *******************************************************************************
spring:
datasource:
## ---- postgres ---------------------------------------------------
url: jdbc:postgresql://entopticadirx:5432/GridFailureInfoDevServer
username: ${GFI_DB_USERNAME}
password: ${GFI_DB_PASSWORD}
# ------------------------------------------------------------------
## ---- oracle -----------------------------------------------------
# enable-oracle-configuration: true
# url: jdbc:oracle:thin:@LIDLORADB2.PTA.DE:1521:NAPDB00
# username: dietricf
# password: dietricf000
# jpa:
# database-platform: org.hibernate.dialect.Oracle10gDialect
# show-sql: false
#
#oracle:
# ucp:
# minPoolSize: 2
# maxPoolSize: 10
# End Orale Config---------------------------------------------------
server:
port: 9164
......@@ -101,6 +117,10 @@ server:
cors:
corsEnabled: true
security.endpoint:
user: admin
password: admin
logging:
level:
root: INFO
......@@ -110,6 +130,7 @@ logging:
adressimport:
cleanup: true
#cron: 0 */1 * ? * *
cron: 0 0 0 1 * ?
file:
addresses: /usr/src/cbd/importFiles/EREP_CSV_ADRESSEN.csv
......@@ -173,4 +194,76 @@ adressimport:
gas-connections: /opt/mics/addressImport/importFiles/EREP_CSV_GAS_HAUSANSCHLUSS.csv
telecommunication-connections: /opt/mics/addressImport/importFiles/EREP_CSV_TELEKOMMUNIKATION_HAUSANSCHLUSS.csv
districtheating-connections: /opt/mics/addressImport/importFiles/EREP_CSV_FERNWAERME_HAUSANSCHLUSS.csv
power-stations: /opt/mics/addressImport/importFiles/EREP_CSV_STROM_STATION.csv
\ No newline at end of file
power-stations: /opt/mics/addressImport/importFiles/EREP_CSV_STROM_STATION.csv
---
spring:
profiles: localdev
datasource:
## ---- postgres ---------------------------------------------------
# url: jdbc:postgresql://entopticadirx:5432/GridFailureInfoDevelop
# username: ${GFI_DB_USERNAME}
# password: ${GFI_DB_PASSWORD}
# ------------------------------------------------------------------
## ---- oracle -----------------------------------------------------
enable-oracle-configuration: true
url: jdbc:oracle:thin:@LIDLORADB2.PTA.DE:1521:NAPDB00
username: dietricf
password: dietricf000
jpa:
database-platform: org.hibernate.dialect.Oracle10gDialect
show-sql: false
oracle:
ucp:
minPoolSize: 2
maxPoolSize: 10
# End Oracle Config---------------------------------------------------
adressimport:
cleanup: true
cron: 0 1 0 1 * ?
file:
addresses: C:/jworkspace/openKonsequenz/grid-failure-information/gridFailureInformation.backend/addressImport/importFiles/EREP_CSV_ADRESSEN.csv
power-connections: C:/jworkspace/openKonsequenz/grid-failure-information/gridFailureInformation.backend/addressImport/importFiles/EREP_CSV_STROM_HAUSANSCHLUSS.csv
water-connections: C:/jworkspace/openKonsequenz/grid-failure-information/gridFailureInformation.backend/addressImport/importFiles/EREP_CSV_WASSER_HAUSANSCHLUSS.csv
gas-connections: C:/jworkspace/openKonsequenz/grid-failure-information/gridFailureInformation.backend/addressImport/importFiles/EREP_CSV_GAS_HAUSANSCHLUSS.csv
telecommunication-connections: C:/jworkspace/openKonsequenz/grid-failure-information/gridFailureInformation.backend/addressImport/importFiles/EREP_CSV_TELEKOMMUNIKATION_HAUSANSCHLUSS.csv
districtheating-connections: C:/jworkspace/openKonsequenz/grid-failure-information/gridFailureInformation.backend/addressImport/importFiles/EREP_CSV_FERNWAERME_HAUSANSCHLUSS.csv
power-stations: C:/jworkspace/openKonsequenz/grid-failure-information/gridFailureInformation.backend/addressImport/importFiles/EREP_CSV_STROM_STATION.csv
server:
port: 9164
max-http-header-size: 262144
servlet:
session:
tracking-modes: cookie
jwt:
tokenHeader: Authorization
useStaticJwt: false
staticJwt: eyJhbGciOiJSUzI1NiIsInR5cCIgOiAiSldUIiwia2lkIiA6ICJIYlI3Z2pobmE2eXJRZnZJTWhUSV9tY2g3ZmtTQWVFX3hLTjBhZVl0bjdjIn0.eyJqdGkiOiI5MGI0NGFkOC1iYjlmLTQ1MzktYTQwYy0yYjQyZTNkNjNiOGEiLCJleHAiOjE1Nzg2NTU3OTUsIm5iZiI6MCwiaWF0IjoxNTc4NjU1NDk1LCJpc3MiOiJodHRwOi8vbG9jYWxob3N0OjgwODAvYXV0aC9yZWFsbXMvRWxvZ2Jvb2siLCJhdWQiOiJlbG9nYm9vay1iYWNrZW5kIiwic3ViIjoiODYyNjY5NmYtZjFhMi00ZGI1LTkyZWYtZTlhMjQ2Njg1YTU0IiwidHlwIjoiQmVhcmVyIiwiYXpwIjoiZWxvZ2Jvb2stYmFja2VuZCIsImF1dGhfdGltZSI6MCwic2Vzc2lvbl9zdGF0ZSI6IjJmMWIzODE5LWZjNjQtNDEzNC1iNWQxLWY3ZWY4NzU5NDBkNCIsImFjciI6IjEiLCJhbGxvd2VkLW9yaWdpbnMiOlsiKiJdLCJyZWFsbV9hY2Nlc3MiOnsicm9sZXMiOlsia29uLWFkbWluIiwia29uLXdyaXRlciIsImtvbi1hY2Nlc3MiLCJrb24tcmVhZGVyIl19LCJyZXNvdXJjZV9hY2Nlc3MiOnt9LCJuYW1lIjoiVGVzdGVyRmlyc3RuYW1lX3J3YSBUZXN0ZXJMYXN0bmFtZV9yd2EiLCJwcmVmZXJyZWRfdXNlcm5hbWUiOiJ0ZXN0dXNlcl9yd2EiLCJnaXZlbl9uYW1lIjoiVGVzdGVyRmlyc3RuYW1lX3J3YSIsImZhbWlseV9uYW1lIjoiVGVzdGVyTGFzdG5hbWVfcndhIn0.DAYXuv4tKn8RXqO1jyttnD-tF4nShUBQyfe4bKbAiPAyY2x5YbAf3M4eXnLrGqo8-loGKldICC28bL0LaMA3KKkQEOfW5sfpGqoN6212vs89mOklt0TJYc5PMXwFgJ5WC_TKjdwq7-aaDafOEWehV0U1ut3s-94ovNYIEn29nzXm2W1ldoXJEq03F880jlysQ5zlRvGF7eXEEpFfI2URyyNQ2UWh0Ssfq-gOAt2pbF1u6prA5RfvUmZ3v1eu21YLGZtgqPqxb1l6odyH3ip15j_HdgnTeo52ymxuRUj65Mskme3V5ev2DitHI9vZgnpV8Idhb4TTWliBeGCOMfDFCg
services:
authNAuth:
name: authNAuthService
authNAuthService:
ribbon:
listOfServers: http://localhost:8080
cors:
corsEnabled: true
logging:
level:
root: INFO
org.eclipse.openk: DEBUG
org.springframework.web: ERROR
org.hibernate: ERROR
swagger:
baseUrl: /addressImporter
-----------------------------------------------------------------------------------
-- *******************************************************************************
-- * Copyright (c) 2019 Contributors to the Eclipse Foundation
-- *
-- * See the NOTICE file(s) distributed with this work for additional
-- * information regarding copyright ownership.
-- *
-- * This program and the accompanying materials are made available under the
-- * terms of the Eclipse Public License v. 2.0 which is available at
-- * http://www.eclipse.org/legal/epl-2.0.
-- *
-- * SPDX-License-Identifier: EPL-2.0
-- *******************************************************************************
-----------------------------------------------------------------------------------
-- ----------------------------------------------------------------------------
-- ----------------------------------------------------------------------------
-- Tables ADDRESSIMPORT
-- ----------------------------------------------------------------------------
-- ----------------------------------------------------------------------------
DROP TABLE IF EXISTS public.TBL_GFI_ADDRESS CASCADE;
DROP SEQUENCE IF EXISTS public.TBL_GFI_ADDRESS_ID_SEQ;
DROP TABLE IF EXISTS public.TBL_ADDRESS CASCADE;
DROP SEQUENCE IF EXISTS public.TBL_ADDRESS_ID_SEQ;
-- ---------------------------------------------
-- TABLE TBL_ADDRESS
-- ---------------------------------------------
CREATE SEQUENCE public.TBL_GFI_ADDRESS_ID_SEQ
INCREMENT 1
MINVALUE 1
MAXVALUE 9223372036854775807
START 1
CACHE 1;
ALTER TABLE public.TBL_GFI_ADDRESS_ID_SEQ
OWNER TO GFI_SERVICE;
CREATE TABLE public.TBL_GFI_ADDRESS
(
ID integer NOT NULL DEFAULT nextval('TBL_GFI_ADDRESS_ID_SEQ'::regclass),
UUID uuid NOT NULL,
SDOX1 numeric(9,2) NOT NULL,
SDOY1 numeric(10,2) NOT NULL,
G3EFID numeric,
POSTCODE character varying(30),
COMMUNITY character varying(255),
DISTRICT character varying(255),
STREET character varying(255),
HOUSENUMBER character varying(30),
WATER_CONNECTION boolean,
WATER_GROUP character varying(255),
GAS_CONNECTION boolean,
GAS_GROUP character varying(255),
POWER_CONNECTION boolean,
DISTRICTHEATING_CONNECTION boolean,
TELECOMM_CONNECTION boolean,
STATION_ID character varying(30),
LONGITUDE numeric(9,6),
LATITUDE numeric(9,6),
CONSTRAINT TBL_ADDRESS_PKEY PRIMARY KEY (id)
);
ALTER TABLE public.TBL_GFI_ADDRESS
OWNER TO GFI_SERVICE;
GRANT ALL ON TABLE public.TBL_GFI_ADDRESS TO GFI_SERVICE;
CREATE INDEX idx_tbl_gfiaddress_g3efid ON public.TBL_GFI_ADDRESS ( G3EFID );
CREATE INDEX idx_tbl_gfiaddress_postcode ON public.TBL_GFI_ADDRESS ( POSTCODE );
CREATE INDEX idx_tbl_gfiaddress_community ON public.TBL_GFI_ADDRESS ( COMMUNITY );
CREATE INDEX idx_tbl_gfiaddress_district ON public.TBL_GFI_ADDRESS ( DISTRICT );
CREATE INDEX idx_tbl_gfiaddress_street ON public.TBL_GFI_ADDRESS ( STREET );
CREATE INDEX idx_tbl_gfiaddress_station_id ON public.TBL_GFI_ADDRESS ( STATION_ID );
-- ---------------------------------------------
-- TABLE TBL_STATION
-- ---------------------------------------------
DROP TABLE IF EXISTS public.TBL_STATION CASCADE;
DROP SEQUENCE IF EXISTS public.TBL_STATION_ID_SEQ;
CREATE SEQUENCE public.TBL_STATION_ID_SEQ
INCREMENT 1
MINVALUE 1
MAXVALUE 9223372036854775807
START 1
CACHE 1;
ALTER TABLE public.TBL_STATION_ID_SEQ
OWNER TO GFI_SERVICE;
CREATE TABLE public.TBL_STATION
(
ID integer NOT NULL DEFAULT nextval('TBL_STATION_ID_SEQ'::regclass),
UUID uuid NOT NULL,
SDOX1 numeric(9,2) NOT NULL,
SDOY1 numeric(10,2) NOT NULL,
G3EFID numeric,
STATION_ID character varying(30),
STATION_NAME character varying(255),
LONGITUDE numeric(9,6),
LATITUDE numeric(9,6),
CONSTRAINT TBL_STATION_PKEY PRIMARY KEY (id)
);
ALTER TABLE public.TBL_STATION
OWNER TO GFI_SERVICE;
GRANT ALL ON TABLE public.TBL_STATION TO GFI_SERVICE;
CREATE INDEX idx_tbl_station_g3efid ON public.TBL_STATION ( G3EFID );
CREATE INDEX idx_tbl_station_station_id ON public.TBL_STATION ( STATION_ID );
CREATE INDEX idx_tbl_station_uuid ON public.TBL_STATION ( UUID );
......@@ -174,7 +174,21 @@
<artifactId>h2</artifactId>
<version>${h2.version}</version>
</dependency>
<!-- https://mvnrepository.com/artifact/com.icegreen/greenmail-spring -->
<dependency>
<groupId>com.oracle.database.jdbc</groupId>
<artifactId>ojdbc8</artifactId>
<version>19.6.0.0</version>
</dependency>
<dependency>
<groupId>com.oracle.database.jdbc</groupId>
<artifactId>ucp</artifactId>
<version>19.6.0.0</version>
</dependency>
<dependency>
<groupId>org.hibernate</groupId>
<artifactId>hibernate-core</artifactId>
<version>5.4.2.Final</version>
</dependency>
<dependency>
<groupId>com.icegreen</groupId>
<artifactId>greenmail-spring</artifactId>
......
package org.eclipse.openk.gridfailureinformation.config;
import lombok.SneakyThrows;
import lombok.extern.log4j.Log4j2;
import oracle.ucp.jdbc.PoolDataSource;
import oracle.ucp.jdbc.PoolDataSourceFactory;
import org.springframework.beans.factory.annotation.Value;
import org.springframework.boot.autoconfigure.condition.ConditionalOnProperty;
import org.springframework.context.annotation.Bean;
import org.springframework.context.annotation.Configuration;
import org.springframework.context.annotation.Primary;
import javax.sql.DataSource;
import java.sql.SQLException;
@Log4j2
@Configuration
@ConditionalOnProperty(
value="spring.datasource.enable-oracle-configuration",
havingValue = "true",
matchIfMissing = false)
public class OracleConfig {
@Value("${spring.datasource.url}")
private String url;
@Value("${spring.datasource.username}")
private String username;
@Value("${spring.datasource.password}")
private String password;
@Value("${oracle.ucp.minPoolSize}")
private String minPoolSize;
@Value("${oracle.ucp.maxPoolSize}")
private String maxPoolSize;
@Value("${spring.datasource.driver-class-name:oracle.jdbc.pool.OracleDataSource}")
private String driverClassName;
@SneakyThrows
@Bean(name = "OracleUniversalConnectionPool")
@Primary
public DataSource getDataSource() {
PoolDataSource pds = null;
try {
pds = PoolDataSourceFactory.getPoolDataSource();
pds.setConnectionFactoryClassName(driverClassName);
pds.setURL(url);
pds.setUser(username);
pds.setPassword(password);
pds.setMinPoolSize(Integer.valueOf(minPoolSize));
pds.setInitialPoolSize(10);
pds.setMaxPoolSize(Integer.valueOf(maxPoolSize));
} catch (SQLException ea) {
log.error("Error connecting to the database: " + ea.getMessage());
}
return pds;
}
}
\ No newline at end of file
......@@ -24,16 +24,9 @@ import org.mapstruct.ReportingPolicy;
@Mapper(componentModel = "spring", unmappedTargetPolicy = ReportingPolicy.IGNORE)
public interface FailureInformationDistributionGroupMapper {
@Mappings({
@Mapping(source = "fkTblFailureInformation", target = "failureInformationId"),
@Mapping(source = "fkTblDistributionGroup", target = "distributionGroupId")
@Mapping(source = "failureInformation.id", target = "failureInformationId"),
@Mapping(source = "distributionGroup.id", target = "distributionGroupId")
})
FailureInformationDistributionGroupDto toFailureInfoDistributionGroupDto(TblFailureInformationDistributionGroup tblFailureInformationDistributionGroup);
@Mappings({
@Mapping(target = "fkTblFailureInformation", source = "failureInformationId"),
@Mapping(target = "fkTblDistributionGroup", source = "distributionGroupId")
})
TblFailureInformationDistributionGroup toTblFailureInformationDistributionGroup(FailureInformationDistributionGroupDto failureInformationDistributionGroupDto);
}
......@@ -14,7 +14,7 @@
*/
package org.eclipse.openk.gridfailureinformation.mapper;
import org.eclipse.openk.gridfailureinformation.model.TblFailureInformationStation;
import org.eclipse.openk.gridfailureinformation.model.TblFailinfoStation;
import org.eclipse.openk.gridfailureinformation.viewmodel.FailureInformationStationDto;
import org.mapstruct.Mapper;
import org.mapstruct.Mapping;
......@@ -24,14 +24,8 @@ import org.mapstruct.ReportingPolicy;
@Mapper(componentModel = "spring", unmappedTargetPolicy = ReportingPolicy.IGNORE)
public interface FailureInformationStationMapper {
@Mappings({
@Mapping(source = "fkTblFailureInformation", target = "failureInformationId")
@Mapping(source = "failureInformation.id", target = "failureInformationId")
})
FailureInformationStationDto toFailureInfoStationDto(TblFailureInformationStation tblFailureInformationStation);
@Mappings({
@Mapping(target = "fkTblFailureInformation", source = "failureInformationId")
})
TblFailureInformationStation toTblFailureInformationStation(FailureInformationStationDto failureInformationStationDto);
FailureInformationStationDto toFailureInfoStationDto(TblFailinfoStation tblFailureInformationStation);
}
......@@ -68,6 +68,7 @@ public class HtblFailureInformation {
private String stationCoords;
private BigDecimal longitude;
private BigDecimal latitude;
@Column( name = "object_ref_ext_system")
private String objectReferenceExternalSystem;
private String publicationStatus;
private String publicationFreetext;
......
......@@ -22,14 +22,16 @@ import javax.persistence.GeneratedValue;
import javax.persistence.GenerationType;
import javax.persistence.Id;
import javax.persistence.SequenceGenerator;
import javax.persistence.Table;
import java.util.Date;