diff --git a/gfsBackendService/src/main/java/org/eclipse/openk/gridfailureinformation/model/HtblFailureInformation.java b/gfsBackendService/src/main/java/org/eclipse/openk/gridfailureinformation/model/HtblFailureInformation.java index 310c0f91bd757a3fcf1c0b54e902de32e7ad77af..3d264694f6c055457157ce310a5966b0da866af7 100644 --- a/gfsBackendService/src/main/java/org/eclipse/openk/gridfailureinformation/model/HtblFailureInformation.java +++ b/gfsBackendService/src/main/java/org/eclipse/openk/gridfailureinformation/model/HtblFailureInformation.java @@ -50,7 +50,6 @@ public class HtblFailureInformation { private Date failureBegin; private Date failureEndPlanned; private Date failureEndResupplied; - private String probableReason; private String internalRemark; private String postcode; private String city; diff --git a/gfsBackendService/src/main/java/org/eclipse/openk/gridfailureinformation/model/TblFailureInformation.java b/gfsBackendService/src/main/java/org/eclipse/openk/gridfailureinformation/model/TblFailureInformation.java index 90443ac9acbfb2c7d31e66cce7f2508cbf5a1bce..90160a16f2999e740b312f83e024b956311a2d65 100644 --- a/gfsBackendService/src/main/java/org/eclipse/openk/gridfailureinformation/model/TblFailureInformation.java +++ b/gfsBackendService/src/main/java/org/eclipse/openk/gridfailureinformation/model/TblFailureInformation.java @@ -50,7 +50,6 @@ public class TblFailureInformation { private Date failureBegin; private Date failureEndPlanned; private Date failureEndResupplied; - private String probableReason; private String internalRemark; private String postcode; private String city; diff --git a/gfsBackendService/src/main/java/org/eclipse/openk/gridfailureinformation/service/FailureInformationService.java b/gfsBackendService/src/main/java/org/eclipse/openk/gridfailureinformation/service/FailureInformationService.java index d4e2cb32041f2a2077d28887989042eec5ecd43e..7c2d220146384360f4f4ea672aa95ed946274152 100644 --- a/gfsBackendService/src/main/java/org/eclipse/openk/gridfailureinformation/service/FailureInformationService.java +++ b/gfsBackendService/src/main/java/org/eclipse/openk/gridfailureinformation/service/FailureInformationService.java @@ -284,7 +284,6 @@ public class FailureInformationService { .collect(Collectors.toList()); if (listFailureInfos.size() == filteredList.size()) { - log.info("alle Radien gleich"); condensedFailureInformation.setRefRadius(listFailureInfos.get(0).getRefRadius()); } else{ @@ -306,7 +305,6 @@ public class FailureInformationService { .collect(Collectors.toList()); if (listFailureInfos.size() == filteredList.size()) { - log.info("alle Strassen gleich"); condensedFailureInformation.setStreet(firstStreet); } } @@ -322,7 +320,6 @@ public class FailureInformationService { .collect(Collectors.toList()); if (listFailureInfos.size() == filteredList.size()) { - log.info("alle Distrikte gleich"); condensedFailureInformation.setDistrict(firstDistrict); } } @@ -338,7 +335,6 @@ public class FailureInformationService { .collect(Collectors.toList()); if (listFailureInfos.size() == filteredList.size()) { - log.info("alle Städte gleich"); condensedFailureInformation.setCity(firstCity); } } @@ -354,7 +350,6 @@ public class FailureInformationService { .collect(Collectors.toList()); if (listFailureInfos.size() == filteredList.size()) { - log.info("alle möglichen Gründe gleich"); condensedFailureInformation.setRefExpectedReason(listFailureInfos.get(0).getRefExpectedReason()); } } @@ -369,7 +364,6 @@ public class FailureInformationService { .findFirst() .orElse(null); - log.info("Enddatum: " + latest); condensedFailureInformation.setFailureEndPlanned(latest); } @@ -383,7 +377,6 @@ public class FailureInformationService { .findFirst() .orElse(null); - log.info("Startdatum: " + earliest); condensedFailureInfo.setFailureBegin(earliest); } @@ -411,7 +404,6 @@ public class FailureInformationService { .collect(Collectors.toList()); if (listFailureInfos.size() == filteredList.size()) { - log.info("alle voltageLevel gleich"); condensedFailureInfo.setVoltageLevel(firstVoltageLevel); } } diff --git a/gfsBackendService/src/main/java/org/eclipse/openk/gridfailureinformation/viewmodel/FailureInformationDto.java b/gfsBackendService/src/main/java/org/eclipse/openk/gridfailureinformation/viewmodel/FailureInformationDto.java index 67104fa54f41b178dea79600739084fe26850452..a53c687c718e8c23354cc8ba0c0f1eb53bd5615e 100644 --- a/gfsBackendService/src/main/java/org/eclipse/openk/gridfailureinformation/viewmodel/FailureInformationDto.java +++ b/gfsBackendService/src/main/java/org/eclipse/openk/gridfailureinformation/viewmodel/FailureInformationDto.java @@ -44,7 +44,6 @@ public class FailureInformationDto implements Serializable { @JsonFormat(shape = JsonFormat.Shape.STRING, pattern = "yyyy-MM-dd'T'HH:mm:ss.SSS'Z'") private Date failureEndResupplied; - private String probableReason; private String internalRemark; private String postcode; private String city; diff --git a/gfsBackendService/src/main/resources/db/migration/V0_16__CREATE_GFI_DB.sql b/gfsBackendService/src/main/resources/db/migration/V0_16__CREATE_GFI_DB.sql new file mode 100644 index 0000000000000000000000000000000000000000..4036a45338b725bf9e07eb65e2fb853c3f3d1399 --- /dev/null +++ b/gfsBackendService/src/main/resources/db/migration/V0_16__CREATE_GFI_DB.sql @@ -0,0 +1,570 @@ +----------------------------------------------------------------------------------- +-- ******************************************************************************* +-- * 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 +-- ******************************************************************************* +----------------------------------------------------------------------------------- +-- CREATE ROLE GFI_SERVICE LOGIN +-- NOSUPERUSER INHERIT NOCREATEDB NOCREATEROLE NOREPLICATION; +-- ALTER ROLE GFI_SERVICE with password 'gfi_service'; + +DROP TABLE IF EXISTS public.VERSION CASCADE; +DROP TABLE IF EXISTS public.TBL_FAILURE_INFORMATION CASCADE; +DROP SEQUENCE IF EXISTS public.TBL_FAILURE_INFORMATION_ID_SEQ; + +DROP TABLE IF EXISTS public.REF_STATUS CASCADE; +DROP SEQUENCE IF EXISTS public.REF_STATUS_ID_SEQ; + +DROP TABLE IF EXISTS public.REF_BRANCH CASCADE; +DROP SEQUENCE IF EXISTS public.REF_BRANCH_ID_SEQ; + +DROP TABLE IF EXISTS public.REF_FAILURE_CLASSIFICATION CASCADE; +DROP SEQUENCE IF EXISTS public.REF_FAILURE_CLASSIFICATION_ID_SEQ; + +DROP TABLE IF EXISTS public.REF_FAILURE_TYPE CASCADE; +DROP SEQUENCE IF EXISTS public.REF_FAILURE_TYPE_ID_SEQ; + +DROP TABLE IF EXISTS public.REF_RADIUS CASCADE; +DROP SEQUENCE IF EXISTS public.REF_RADIUS_ID_SEQ; + +DROP TABLE IF EXISTS public.REF_EXPECTED_REASON CASCADE; +DROP SEQUENCE IF EXISTS public.REF_EXPECTED_REASON_ID_SEQ; + +DROP TABLE IF EXISTS public.TBL_IMPORT_DATA CASCADE; +DROP SEQUENCE IF EXISTS public.TBL_IMPORT_DATA_ID_SEQ; + +-- --------------------------------------------- +-- TABLE VERSION +-- --------------------------------------------- +CREATE TABLE public.VERSION +( + ID integer NOT NULL, + VERSION character varying(50) NOT NULL, + CONSTRAINT REF_VERSION_PKEY PRIMARY KEY (id) +); + +ALTER TABLE public.VERSION + OWNER TO GFI_SERVICE; +GRANT ALL ON TABLE public.VERSION TO GFI_SERVICE; + +INSERT INTO public.VERSION (ID, VERSION) VALUES ( 1, '00-DEV' ); + +-- --------------------------------------------- +-- TABLE REF_STATUS +-- --------------------------------------------- +CREATE SEQUENCE public.ref_status_id_seq + INCREMENT 1 + MINVALUE 1 + MAXVALUE 9223372036854775807 + START 1 + CACHE 1; +ALTER TABLE public.ref_status_id_seq + OWNER TO GFI_SERVICE; + +CREATE TABLE public.REF_STATUS +( + ID integer NOT NULL DEFAULT nextval('REF_STATUS_ID_SEQ'::regclass), + UUID uuid NOT NULL, + STATUS character varying(50) NOT NULL, + IS_INTERNAL boolean NOT NULL, + IS_EXTERNAL boolean NOT NULL, + CONSTRAINT REF_STATUS_PKEY PRIMARY KEY (id) +); + +ALTER TABLE public.REF_STATUS + OWNER TO GFI_SERVICE; +GRANT ALL ON TABLE public.REF_STATUS TO GFI_SERVICE; + +INSERT INTO public.REF_STATUS (UUID, STATUS, IS_INTERNAL, IS_EXTERNAL) VALUES ( 'acabc8f6-2cf3-485a-a4f8-68d178c7df45', 'neu', TRUE, TRUE ); +INSERT INTO public.REF_STATUS (UUID, STATUS, IS_INTERNAL, IS_EXTERNAL) VALUES ( 'a6cda99d-9f41-4637-9d9b-04f95ea352ec', 'bestätigt', TRUE, TRUE ); +INSERT INTO public.REF_STATUS (UUID, STATUS, IS_INTERNAL, IS_EXTERNAL) VALUES ( '23fc0254-cc3d-4371-97ad-54ef733008ae', 'aktiv', TRUE, FALSE ); +INSERT INTO public.REF_STATUS (UUID, STATUS, IS_INTERNAL, IS_EXTERNAL) VALUES ( '9374219a-7419-4b72-899d-cd0576d85cdb', 'geschlossen', TRUE, TRUE ); +INSERT INTO public.REF_STATUS (UUID, STATUS, IS_INTERNAL, IS_EXTERNAL) VALUES ( '74a4ca78-7268-11ea-bc55-0242ac130003', 'storniert', TRUE, FALSE ); +INSERT INTO public.REF_STATUS (UUID, STATUS, IS_INTERNAL, IS_EXTERNAL) VALUES ( '95bc40ba-7268-11ea-bc55-0242ac130003', 'qualifiziert', TRUE, FALSE ); +INSERT INTO public.REF_STATUS (UUID, STATUS, IS_INTERNAL, IS_EXTERNAL) VALUES ( '0c2e5c36-733d-11ea-bc55-0242ac130003', 'angelegt', TRUE, FALSE ); +INSERT INTO public.REF_STATUS (UUID, STATUS, IS_INTERNAL, IS_EXTERNAL) VALUES ( '0c2e5f74-733d-11ea-bc55-0242ac130003', 'aktualisiert', TRUE, FALSE ); +INSERT INTO public.REF_STATUS (UUID, STATUS, IS_INTERNAL, IS_EXTERNAL) VALUES ( '0c2e606e-733d-11ea-bc55-0242ac130003', 'geplant', TRUE, FALSE ); + + +-- --------------------------------------------- +-- TABLE REF_FAILURE_CLASSIFICATION +-- --------------------------------------------- +CREATE SEQUENCE public.ref_failure_classification_id_seq + INCREMENT 1 + MINVALUE 1 + MAXVALUE 9223372036854775807 + START 1 + CACHE 1; +ALTER TABLE public.ref_failure_classification_id_seq + OWNER TO GFI_SERVICE; + +CREATE TABLE public.REF_FAILURE_CLASSIFICATION +( + ID integer NOT NULL DEFAULT nextval('REF_FAILURE_CLASSIFICATION_ID_SEQ'::regclass), + UUID uuid NOT NULL, + CLASSIFICATION character varying(50) NOT NULL, + DESCRIPTION character varying(255) NULL, + CONSTRAINT REF_FAILURE_CLASSIFICATION_PKEY PRIMARY KEY (id) +); + +ALTER TABLE public.REF_FAILURE_CLASSIFICATION + OWNER TO GFI_SERVICE; +GRANT ALL ON TABLE public.REF_FAILURE_CLASSIFICATION TO GFI_SERVICE; + +INSERT INTO public.REF_FAILURE_CLASSIFICATION (UUID, CLASSIFICATION, DESCRIPTION) VALUES ( '9255fb79-c57a-4448-a69c-5d57994f0c91', 'Störung', NULL ); +INSERT INTO public.REF_FAILURE_CLASSIFICATION (UUID, CLASSIFICATION, DESCRIPTION) VALUES ( '8ec1e144-5230-4d43-a3df-f62dd64bb855', 'geplante Maßnahme', NULL ); + + +-- --------------------------------------------- +-- TABLE REF_FAILURE_TYPE +-- --------------------------------------------- +CREATE SEQUENCE public.ref_failure_type_id_seq + INCREMENT 1 + MINVALUE 1 + MAXVALUE 9223372036854775807 + START 1 + CACHE 1; +ALTER TABLE public.ref_failure_type_id_seq + OWNER TO GFI_SERVICE; + +CREATE TABLE public.REF_FAILURE_TYPE +( + ID integer NOT NULL DEFAULT nextval('REF_FAILURE_TYPE_ID_SEQ'::regclass), + UUID uuid NOT NULL, + TYPE character varying(50) NOT NULL, + DESCRIPTION character varying(255) NULL, + CONSTRAINT REF_FAILURE_TYPE_PKEY PRIMARY KEY (id) +); + +ALTER TABLE public.REF_FAILURE_TYPE + OWNER TO GFI_SERVICE; +GRANT ALL ON TABLE public.REF_FAILURE_TYPE TO GFI_SERVICE; + + +INSERT INTO public.REF_FAILURE_TYPE (UUID, TYPE, DESCRIPTION) VALUES ( '44a2aaed-8910-4116-b0c4-0855f8d3c28d', 'Information', NULL ); +INSERT INTO public.REF_FAILURE_TYPE (UUID, TYPE, DESCRIPTION) VALUES ( '94e880c4-3127-47d5-aaee-5f778462ab0c', 'zu veröffentliche Meldung', 'Standardwert' ); +INSERT INTO public.REF_FAILURE_TYPE (UUID, TYPE, DESCRIPTION) VALUES ( '658245bd-bdc4-47dd-bc90-0336f9471410', 'unterlagerte Störung', 'Nicht zu veröffentlichen' ); + +-- --------------------------------------------- +-- TABLE REF_BRANCH +-- --------------------------------------------- +CREATE SEQUENCE public.ref_branch_id_seq + INCREMENT 1 + MINVALUE 1 + MAXVALUE 9223372036854775807 + START 1 + CACHE 1; +ALTER TABLE public.ref_branch_id_seq + OWNER TO GFI_SERVICE; + +CREATE TABLE public.REF_BRANCH +( + ID integer NOT NULL DEFAULT nextval('REF_BRANCH_ID_SEQ'::regclass), + UUID uuid NOT NULL, + NAME character varying(50) NOT NULL, + DESCRIPTION character varying(255), + COLOR_CODE character varying(20), + CONSTRAINT REF_BRANCH_PKEY PRIMARY KEY (id) +); + +ALTER TABLE public.REF_BRANCH + OWNER TO GFI_SERVICE; +GRANT ALL ON TABLE public.REF_BRANCH TO GFI_SERVICE; + +INSERT INTO public.ref_branch(uuid, name, description, color_code) VALUES ('535b4beb-9b17-4247-bb8b-26bd01b48f9a', 'S', 'Strom', '#fc6042'); +INSERT INTO public.ref_branch(uuid, name, description, color_code) VALUES ('d41f54e5-c4df-440e-b334-40e8f3a6854a', 'G', 'Gas', '#fdea64'); +INSERT INTO public.ref_branch(uuid, name, description, color_code) VALUES ('62c6d361-96a0-41cc-bda1-4e58ad16f21a', 'F', 'Fernwärme', '#2cc990'); +INSERT INTO public.ref_branch(uuid, name, description, color_code) VALUES ('d8d93e0e-5c8c-4ab8-9625-f820de55ee7c', 'W', 'Wasser', '#2c82c9'); +INSERT INTO public.ref_branch(uuid, name, description, color_code) VALUES ('7d4907fb-cb3f-4a4f-93e9-839052e76894', 'TK', 'Telekommunikation', '#ff33cc'); +INSERT INTO public.ref_branch(uuid, name, description, color_code) VALUES ('014c4a2a-3cf1-4d28-af70-4573722bceb0', 'ST', 'Sekundärtechnik', '#9933ff'); + + +-- --------------------------------------------- +-- TABLE REF_EXPECTED_REASON +-- --------------------------------------------- +CREATE SEQUENCE public.ref_expected_reason_id_seq + INCREMENT 1 + MINVALUE 1 + MAXVALUE 9223372036854775807 + START 1 + CACHE 1; +ALTER TABLE public.ref_expected_reason_id_seq + OWNER TO GFI_SERVICE; + +CREATE TABLE public.REF_EXPECTED_REASON +( + ID integer NOT NULL DEFAULT nextval('REF_EXPECTED_REASON_ID_SEQ'::regclass), + UUID uuid NOT NULL, + TEXT character varying(100) NOT NULL, + DESCRIPTION character varying(255) NULL, + CONSTRAINT REF_EXPECTED_REASON_PKEY PRIMARY KEY (id) +); + +ALTER TABLE public.REF_EXPECTED_REASON + OWNER TO GFI_SERVICE; +GRANT ALL ON TABLE public.REF_EXPECTED_REASON TO GFI_SERVICE; + +INSERT INTO public.ref_expected_reason(uuid, text, description) VALUES ('27a07918-6aa0-11ea-bc55-0242ac130003', 'Defekt technische Anlage', 'Dies ist die Beschreibung für: Defekt technische Anlage'); +INSERT INTO public.ref_expected_reason(uuid, text, description) VALUES ('27a07c42-6aa0-11ea-bc55-0242ac130003', 'Kabelfehler Mittelspannung', 'Dies ist die Beschreibung für: Kabelfehler Mittelspannung'); +INSERT INTO public.ref_expected_reason(uuid, text, description) VALUES ('27a07d50-6aa0-11ea-bc55-0242ac130003', 'Kabelfehler Niederspannung', 'Dies ist die Beschreibung für: Kabelfehler Niederspannung'); +INSERT INTO public.ref_expected_reason(uuid, text, description) VALUES ('27a07e22-6aa0-11ea-bc55-0242ac130003', 'Leitung beschädigt', 'Dies ist die Beschreibung für: Leitung beschädigt'); +INSERT INTO public.ref_expected_reason(uuid, text, description) VALUES ('27a07eea-6aa0-11ea-bc55-0242ac130003', 'noch nicht bekannt', 'Dies ist die Beschreibung für: noch nicht bekannt'); +INSERT INTO public.ref_expected_reason(uuid, text, description) VALUES ('27a07fbc-6aa0-11ea-bc55-0242ac130003', 'Wasserrohrbruch', 'Dies ist die Beschreibung für: Wasserrohrbruch'); +INSERT INTO public.ref_expected_reason(uuid, text, description) VALUES ('27a08160-6aa0-11ea-bc55-0242ac130003', 'Überregionale Störung', 'Dies ist die Beschreibung für: Überregionale Störung'); + +-- --------------------------------------------- +-- TABLE REF_RADIUS +-- --------------------------------------------- +CREATE SEQUENCE public.ref_radius_id_seq + INCREMENT 1 + MINVALUE 1 + MAXVALUE 9223372036854775807 + START 1 + CACHE 1; +ALTER TABLE public.ref_radius_id_seq + OWNER TO GFI_SERVICE; + +CREATE TABLE public.REF_RADIUS +( + ID integer NOT NULL DEFAULT nextval('REF_RADIUS_ID_SEQ'::regclass), + UUID uuid NOT NULL, + RADIUS character varying(20) NOT NULL, + CONSTRAINT REF_RADIUS_PKEY PRIMARY KEY (id) +); + +ALTER TABLE public.REF_RADIUS + OWNER TO GFI_SERVICE; +GRANT ALL ON TABLE public.REF_RADIUS TO GFI_SERVICE; + +INSERT INTO public.REF_RADIUS(uuid, radius) VALUES ('36671000-6aa6-11ea-bc55-0242ac130003', '50m'); +INSERT INTO public.REF_RADIUS(uuid, radius) VALUES ('366712a8-6aa6-11ea-bc55-0242ac130003', '100m'); +INSERT INTO public.REF_RADIUS(uuid, radius) VALUES ('366713c0-6aa6-11ea-bc55-0242ac130003', '250m'); +INSERT INTO public.REF_RADIUS(uuid, radius) VALUES ('3667150a-6aa6-11ea-bc55-0242ac130003', '500m'); +INSERT INTO public.REF_RADIUS(uuid, radius) VALUES ('36671780-6aa6-11ea-bc55-0242ac130003', '1000m'); +INSERT INTO public.REF_RADIUS(uuid, radius) VALUES ('3667187a-6aa6-11ea-bc55-0242ac130003', '1500m'); +INSERT INTO public.REF_RADIUS(uuid, radius) VALUES ('36671ad2-6aa6-11ea-bc55-0242ac130003', '2000m'); + +-- --------------------------------------------- +-- TABLE TBL_FAILURE_INFORMATION +-- --------------------------------------------- +CREATE SEQUENCE public.tbl_failure_information_id_seq + INCREMENT 1 + MINVALUE 1 + MAXVALUE 9223372036854775807 + START 1 + CACHE 1; +ALTER TABLE public.tbl_failure_information_id_seq + OWNER TO GFI_SERVICE; + +CREATE TABLE public.TBL_FAILURE_INFORMATION +( + ID integer NOT NULL DEFAULT nextval('TBL_FAILURE_INFORMATION_ID_SEQ'::regclass), + UUID uuid NOT NULL, + VERSION_NUMBER integer NOT NULL, + FK_REF_FAILURE_CLASSIFICATION integer, + FK_REF_FAILURE_TYPE integer, + TITLE character varying(255) NULL, + DESCRIPTION character varying(255) NULL, + RESPONSIBILITY character varying(255), + INTERN_EXTERN character varying(1), + FK_REF_STATUS_INTERN integer NOT NULL, + FK_REF_STATUS_EXTERN integer NOT NULL, + FK_REF_BRANCH integer NOT NULL, + VOLTAGE_LEVEL character varying(2), + PRESSURE_LEVEL character varying(2), + FAILURE_BEGIN timestamp NOT NULL, + FAILURE_END_PLANNED timestamp, + FAILURE_END_RESUPPLIED timestamp, + INTERNAL_REMARK character varying(1024), + POSTCODE character varying(30), + CITY character varying(255), + DISTRICT character varying(255), + STREET character varying(255), + HOUSENUMBER character varying(30), + STATION_ID character varying (30), + STATION_DESCRIPTION character varying (255), + STATION_COORDS character varying (255), + FK_REF_RADIUS integer NOT NULL, + LONGITUDE numeric(9,6), + LATITUDE numeric(9,6), + FK_TBL_FAILURE_INFORMATION_CONDENSED integer, + CONDENSED boolean, + OBJECT_REFERENCE_EXTERNAL_SYSTEM character varying (255), + PUBLICATION_STATUS character varying (40), + PUBLICATION_FREETEXT character varying (1024), + FK_REF_EXPECTED_REASON integer, + CREATE_DATE timestamp without time zone NOT NULL, + CREATE_USER character varying(100) NOT NULL, + MOD_DATE timestamp without time zone NOT NULL, + MOD_USER character varying(100), + CONSTRAINT TBL_FAILURE_INFORMATION_PKEY PRIMARY KEY (id) +); + +ALTER TABLE public.TBL_FAILURE_INFORMATION + OWNER TO GFI_SERVICE; +GRANT ALL ON TABLE public.TBL_FAILURE_INFORMATION TO GFI_SERVICE; + +INSERT INTO public.tbl_failure_information(UUID, VERSION_NUMBER, FK_REF_FAILURE_CLASSIFICATION, FK_REF_FAILURE_TYPE, TITLE, DESCRIPTION, RESPONSIBILITY, INTERN_EXTERN, FK_REF_STATUS_INTERN, FK_REF_STATUS_EXTERN, FK_REF_BRANCH, VOLTAGE_LEVEL, PRESSURE_LEVEL, FAILURE_BEGIN, FAILURE_END_PLANNED, FAILURE_END_RESUPPLIED, INTERNAL_REMARK, POSTCODE, CITY, DISTRICT, STREET, HOUSENUMBER, STATION_ID, STATION_DESCRIPTION, STATION_COORDS, FK_REF_RADIUS, LONGITUDE, LATITUDE, OBJECT_REFERENCE_EXTERNAL_SYSTEM, PUBLICATION_STATUS, PUBLICATION_FREETEXT, FK_REF_EXPECTED_REASON, CONDENSED, FK_TBL_FAILURE_INFORMATION_CONDENSED, CREATE_DATE, CREATE_USER, MOD_DATE, MOD_USER) +VALUES ('6432a9c9-0384-44af-9bb8-34f2878d7b49',3, 1, 1, 'Stromausfall Murr', 'Es gibt einen Stromausfall im Bereich Murr/Westbezirk', 'Rolf Rudis', 'I', 1, 1, 1, 'NS', null, '2021-01-19 00:00:00', '2021-01-22 00:00:00', '2021-01-22 12:00:00', 'Der Bagger grub zu tief', '71711', 'Murr', 'Westbezirk', 'Ferdinand-Porsche-Straße', '2', '52863a', 'Trafo 1', '124,2323', 2, 9.247952, 48.955700, 'Link - extenes System', 'veröffentlicht', 'Freitext für die Veröffentlichung: Defekt an Trafostation', 1, false, null, '2020-01-22 15:32:15', 'SCRIPT', '2020-01-24 08:02:44', 'SCRIPT'); + +INSERT INTO public.tbl_failure_information(UUID, VERSION_NUMBER, FK_REF_FAILURE_CLASSIFICATION, FK_REF_FAILURE_TYPE, TITLE, DESCRIPTION, RESPONSIBILITY, INTERN_EXTERN, FK_REF_STATUS_INTERN, FK_REF_STATUS_EXTERN, FK_REF_BRANCH, VOLTAGE_LEVEL, PRESSURE_LEVEL, FAILURE_BEGIN, FAILURE_END_PLANNED, FAILURE_END_RESUPPLIED, INTERNAL_REMARK, POSTCODE, CITY, DISTRICT, STREET, HOUSENUMBER, STATION_ID, STATION_DESCRIPTION, STATION_COORDS, FK_REF_RADIUS, LONGITUDE, LATITUDE, OBJECT_REFERENCE_EXTERNAL_SYSTEM, PUBLICATION_STATUS, PUBLICATION_FREETEXT, FK_REF_EXPECTED_REASON, CONDENSED, FK_TBL_FAILURE_INFORMATION_CONDENSED, CREATE_DATE, CREATE_USER, MOD_DATE, MOD_USER) +VALUES ('37aef635-d0d4-4c47-ac25-c0d16c29e35c', 1, 2, 2, 'Gasleck Oldenburg', 'Es gibt ein Gasleck in Oldenburg', 'Bernd Britzel', 'E', 2, 2, 3, 'NS', 'HD', '2021-05-19 00:00:00', '2021-05-22 00:00:00', '2021-05-22 12:00:00', 'HD betroffen', '26133', 'Oldenburg', null, 'Cloppenburger Str.', '302', '1234863-b234', 'ertf', '124,2323', 4, 8.210150, 53.111820, 'Link - extenes System', 'nicht veröffentlicht', 'Freitext: Eine Gasleitung wurde beschädigt', 4, false, null, '2020-02-03 15:15:15', 'SCRIPT', '2020-02-24 20:08:41', 'SCRIPT'); + +-- --------------------------------------------- +-- TABLE TBL_IMPORT_DATA +-- --------------------------------------------- +CREATE SEQUENCE public.tbl_import_data_id_seq + INCREMENT 1 + MINVALUE 1 + MAXVALUE 9223372036854775807 + START 1 + CACHE 1; +ALTER TABLE public.tbl_import_data_id_seq + OWNER TO GFI_SERVICE; + +CREATE TABLE public.TBL_IMPORT_DATA +( + ID integer NOT NULL DEFAULT nextval('TBL_IMPORT_DATA_ID_SEQ'::regclass), + UUID uuid NOT NULL, + META_ID character varying(255) NOT NULL, + DESCRIPTION character varying(255) NULL, + SOURCE character varying(255) NULL, + MESSAGE_CONTENT character varying(1024) NOT NULL, + CONSTRAINT TBL_IMPORT_DATA_PKEY PRIMARY KEY (id) +); + +ALTER TABLE public.TBL_IMPORT_DATA + OWNER TO GFI_SERVICE; +GRANT ALL ON TABLE public.TBL_IMPORT_DATA TO GFI_SERVICE; + +INSERT INTO public.tbl_import_data(uuid, meta_id, description, source, message_content) +VALUES ('355b4beb-9b17-4247-bb8b-36bd01b48f9a', 'StoeDE_10.03.2020 10:31:000 XYZ', 'Gasleck im Haus', 'Stoerungen.de', '{ "Quelle": "Stoerungen.de", "Eigenschaften": {"Branch": "Gas", "Ort": "Worms", "Datum": "2020-03-10T10:31.000Z"}}'); +INSERT INTO public.tbl_import_data(uuid, meta_id, description, source, message_content) +VALUES ('d61f54e5-c4df-440e-b334-22e8f3a6854a', 'StoeDE_10.03.2020 10:31:000 XYZ', 'Gasleck im Haus', 'Stoerungen.de', '{ "Quelle": "Stoerungen.de", "Eigenschaften": {"Branch": "Gas", "Ort": "Worms", "Datum": "2020-03-10T10:31.000Z"}}'); +INSERT INTO public.tbl_import_data(uuid, meta_id, description, source, message_content) +VALUES ('26c6d361-96a0-41cc-bda1-4e85ad16f21a', 'email_10.03.2020 23:45:000 ABC', 'Stromausfall im Haus', 'email', '{ "Quelle": "email", "Eigenschaften": {"Branch": "Strom", "Ort": "Kassel", "Datum": "2020-06-11T23:45.000Z"}}'); +INSERT INTO public.tbl_import_data(uuid, meta_id, description, source, message_content) +VALUES ('d7d93e0e-5c8c-4ab8-9625-f910de55ee7c', 'Intern_04.09.2020 13:12:110 BLA', 'Wasserrohrbruch in der Straße', 'Intern', '{ "Quelle": "Intern", "Eigenschaften": {"Branch": "Wasser", "Ort": "Kassel", "Datum": "2020-09-04T13:12.110Z"}}'); + + +-- ---------------------------------------------------------------------------- +-- ---------------------------------------------------------------------------- +-- HISTORY-TABLES +-- ---------------------------------------------------------------------------- +-- ---------------------------------------------------------------------------- + + +-- PUBLIC.HTBL_FAILURE_INFORMATION Automatic generanted History Table DDL -- +-- <GENERATED CODE!> + +DROP TABLE IF EXISTS PUBLIC.HTBL_FAILURE_INFORMATION; +DROP SEQUENCE IF EXISTS PUBLIC.HTBL_FAILURE_INFORMATION_ID_SEQ; + +CREATE SEQUENCE PUBLIC.HTBL_FAILURE_INFORMATION_ID_SEQ + INCREMENT 1 + MINVALUE 1 + MAXVALUE 9223372036854775807 + START 1 + CACHE 1; + +ALTER TABLE PUBLIC.HTBL_FAILURE_INFORMATION_ID_SEQ + OWNER TO gfi_service; + +CREATE TABLE PUBLIC.HTBL_FAILURE_INFORMATION +( + HID integer NOT NULL DEFAULT nextval('HTBL_FAILURE_INFORMATION_ID_SEQ'::regclass), + HACTION integer NOT NULL, + HDATE timestamp without time zone NOT NULL, + HUSER character varying(100), + + ID integer, + UUID uuid, + VERSION_NUMBER integer, + FK_REF_FAILURE_CLASSIFICATION integer, + FK_REF_FAILURE_TYPE integer, + TITLE character varying(255) NULL, + DESCRIPTION character varying(255) NULL, + RESPONSIBILITY character varying (255), + INTERN_EXTERN character varying (1), + FK_REF_STATUS_INTERN integer, + FK_REF_STATUS_EXTERN integer, + FK_REF_BRANCH integer, + VOLTAGE_LEVEL character varying (2), + PRESSURE_LEVEL character varying (2), + FAILURE_BEGIN timestamp without time zone, + FAILURE_END_PLANNED timestamp without time zone, + FAILURE_END_RESUPPLIED timestamp without time zone, + INTERNAL_REMARK character varying (1024), + POSTCODE character varying (30), + CITY character varying (255), + DISTRICT character varying (255), + STREET character varying (255), + HOUSENUMBER character varying (30), + STATION_ID character varying (30), + STATION_DESCRIPTION character varying (255), + STATION_COORDS character varying (255), + FK_REF_RADIUS integer, + LONGITUDE numeric(9,6), + LATITUDE numeric(9,6), + FK_TBL_FAILURE_INFORMATION_CONDENSED integer, + CONDENSED boolean, + OBJECT_REFERENCE_EXTERNAL_SYSTEM character varying (255), + PUBLICATION_STATUS character varying (40), + PUBLICATION_FREETEXT character varying (1024), + FK_REF_EXPECTED_REASON integer, + CREATE_USER character varying(100), + CREATE_DATE timestamp without time zone, + MOD_USER character varying(100), + MOD_DATE timestamp without time zone, + CONSTRAINT HTBL_FAILURE_INFORMATION_PKEY PRIMARY KEY (HID) +) +WITH ( + OIDS=FALSE +); + +ALTER TABLE PUBLIC.HTBL_FAILURE_INFORMATION + OWNER TO gfi_service; +GRANT ALL ON TABLE PUBLIC.HTBL_FAILURE_INFORMATION TO gfi_service; + +INSERT INTO public.htbl_failure_information(HACTION, HDATE, HUSER, ID, UUID, VERSION_NUMBER, FK_REF_FAILURE_CLASSIFICATION, FK_REF_FAILURE_TYPE, TITLE, DESCRIPTION, RESPONSIBILITY, INTERN_EXTERN, FK_REF_STATUS_INTERN, FK_REF_STATUS_EXTERN, FK_REF_BRANCH, VOLTAGE_LEVEL, PRESSURE_LEVEL, FAILURE_BEGIN, FAILURE_END_PLANNED, FAILURE_END_RESUPPLIED, INTERNAL_REMARK, POSTCODE, CITY, DISTRICT, STREET, HOUSENUMBER, STATION_ID, STATION_DESCRIPTION, STATION_COORDS, FK_REF_RADIUS, LONGITUDE, LATITUDE, OBJECT_REFERENCE_EXTERNAL_SYSTEM, PUBLICATION_STATUS, PUBLICATION_FREETEXT, FK_REF_EXPECTED_REASON, FK_TBL_FAILURE_INFORMATION_CONDENSED, CONDENSED, CREATE_DATE, CREATE_USER, MOD_DATE, MOD_USER) +VALUES (1, '2020-03-13 00:00:00', 'SCRIPT', 1, '6432a9c9-0384-44af-9bb8-34f2878d7b49', 1, 1, 1, 'Stromausfall Murr', 'Es gibt einen Stromausfall im Bereich Murr/Westbezirk', 'Rolf Rudis', 'I', 1, 1, 1, 'NS', null, '2021-01-19 00:00:00', '2021-01-22 00:00:00', '2021-01-22 12:00:00', 'Der Bagger grub zu tief', '71711', 'Murr', 'Westbezirk', 'Ferdinand-Porsche-Straße', '2', '52863a', 'Trafo 1', '124,2323', 2, 9.247952, 48.955700, 'Link - extenes System', 'veröffentlicht', 'Freitext für die Veröffentlichung: Defekt an Trafostation', 1, null, false, '2020-01-22 15:32:15', 'SCRIPT', '2020-01-24 08:02:44', 'SCRIPT'); + +INSERT INTO public.htbl_failure_information(HACTION, HDATE, HUSER, ID, UUID, VERSION_NUMBER, FK_REF_FAILURE_CLASSIFICATION, FK_REF_FAILURE_TYPE, TITLE, DESCRIPTION, RESPONSIBILITY, INTERN_EXTERN, FK_REF_STATUS_INTERN, FK_REF_STATUS_EXTERN, FK_REF_BRANCH, VOLTAGE_LEVEL, PRESSURE_LEVEL, FAILURE_BEGIN, FAILURE_END_PLANNED, FAILURE_END_RESUPPLIED, INTERNAL_REMARK, POSTCODE, CITY, DISTRICT, STREET, HOUSENUMBER, STATION_ID, STATION_DESCRIPTION, STATION_COORDS, FK_REF_RADIUS, LONGITUDE, LATITUDE, OBJECT_REFERENCE_EXTERNAL_SYSTEM, PUBLICATION_STATUS, PUBLICATION_FREETEXT, FK_REF_EXPECTED_REASON, FK_TBL_FAILURE_INFORMATION_CONDENSED, CONDENSED, CREATE_DATE, CREATE_USER, MOD_DATE, MOD_USER) +VALUES (2, '2020-03-13 00:00:00', 'SCRIPT', 2, '37aef635-d0d4-4c47-ac25-c0d16c29e35c', 1, 2, 2, 'Gasleck Oldenburg', 'Es gibt ein Gasleck in Oldenburg', 'Bernd Britzel', 'E', 2, 2, 3, 'NS', 'HD', '2021-05-19 00:00:00', '2021-05-22 00:00:00', '2021-05-22 12:00:00', 'HD betroffen', '26133', 'Oldenburg', null, 'Cloppenburger Str.', '302', '1234863-b234', 'ertf', '124,2323', 4, 8.210150, 53.111820, 'Link - extenes System', 'nicht veröffentlicht', 'Freitext: Eine Gasleitung wurde beschädigt', 4, null, false, '2020-02-03 15:15:15', 'SCRIPT', '2020-02-24 20:08:41', 'SCRIPT'); + +-- ---------------------------------------------------------------------------- +-- ---------------------------------------------------------------------------- +-- TRIGGER +-- ---------------------------------------------------------------------------- +-- ---------------------------------------------------------------------------- + + +-- PUBLIC.TBL_FAILURE_INFORMATION INSERT TRIGGER -- +-- <GENERATED CODE!> +CREATE OR REPLACE FUNCTION PUBLIC.TBL_FAILURE_INFORMATION_INSERT_TRG() + RETURNS trigger AS +$BODY$ + BEGIN + INSERT INTO HTBL_FAILURE_INFORMATION ( + ID,UUID,VERSION_NUMBER,FK_REF_FAILURE_CLASSIFICATION,FK_REF_FAILURE_TYPE,TITLE, DESCRIPTION,RESPONSIBILITY,INTERN_EXTERN,FK_REF_STATUS_INTERN,FK_REF_STATUS_EXTERN,FK_REF_BRANCH,VOLTAGE_LEVEL,PRESSURE_LEVEL,FAILURE_BEGIN,FAILURE_END_PLANNED,FAILURE_END_RESUPPLIED,INTERNAL_REMARK,POSTCODE,CITY,DISTRICT,STREET,HOUSENUMBER,STATION_ID,STATION_DESCRIPTION,STATION_COORDS,FK_REF_RADIUS,LONGITUDE,LATITUDE,OBJECT_REFERENCE_EXTERNAL_SYSTEM,PUBLICATION_STATUS,PUBLICATION_FREETEXT,FK_REF_EXPECTED_REASON,CREATE_DATE,CREATE_USER,MOD_DATE,MOD_USER, + + HACTION, + HDATE, + HUSER + ) + VALUES ( + + NEW.ID,NEW.UUID,NEW.VERSION_NUMBER,NEW.FK_REF_FAILURE_CLASSIFICATION,NEW.FK_REF_FAILURE_TYPE,NEW.TITLE,NEW.DESCRIPTION,NEW.RESPONSIBILITY,NEW.INTERN_EXTERN,NEW.FK_REF_STATUS_INTERN,NEW.FK_REF_STATUS_EXTERN,NEW.FK_REF_BRANCH,NEW.VOLTAGE_LEVEL,NEW.PRESSURE_LEVEL,NEW.FAILURE_BEGIN,NEW.FAILURE_END_PLANNED,NEW.FAILURE_END_RESUPPLIED,NEW.INTERNAL_REMARK,NEW.POSTCODE,NEW.CITY,NEW.DISTRICT,NEW.STREET,NEW.HOUSENUMBER,NEW.STATION_ID,NEW.STATION_DESCRIPTION,NEW.STATION_COORDS,NEW.FK_REF_RADIUS,NEW.LONGITUDE,NEW.LATITUDE,NEW.OBJECT_REFERENCE_EXTERNAL_SYSTEM,NEW.PUBLICATION_STATUS,NEW.PUBLICATION_FREETEXT,NEW.FK_REF_EXPECTED_REASON,NEW.CREATE_DATE,NEW.CREATE_USER,NEW.MOD_DATE,NEW.MOD_USER, + + 1, + current_timestamp, + NEW.CREATE_USER ); + + RETURN NEW; + END; +$BODY$ + LANGUAGE plpgsql VOLATILE + COST 100; +ALTER FUNCTION PUBLIC.TBL_FAILURE_INFORMATION_INSERT_TRG() + OWNER TO gfi_service; + + +DROP TRIGGER IF EXISTS TBL_FAILURE_INFORMATION_INSERT_TRG ON PUBLIC.TBL_FAILURE_INFORMATION; + +CREATE TRIGGER TBL_FAILURE_INFORMATION_INSERT_TRG + BEFORE INSERT + ON PUBLIC.TBL_FAILURE_INFORMATION + FOR EACH ROW + EXECUTE PROCEDURE PUBLIC.TBL_FAILURE_INFORMATION_INSERT_TRG(); + + + +-- PUBLIC.TBL_FAILURE_INFORMATION UPDATE TRIGGER -- +-- <GENERATED CODE!> + +CREATE OR REPLACE FUNCTION PUBLIC.TBL_FAILURE_INFORMATION_UPDATE_TRG() + RETURNS trigger AS +$BODY$ + BEGIN + INSERT INTO HTBL_FAILURE_INFORMATION ( + ID,UUID,VERSION_NUMBER,FK_REF_FAILURE_CLASSIFICATION,FK_REF_FAILURE_TYPE,RESPONSIBILITY,INTERN_EXTERN,FK_REF_STATUS_INTERN,FK_REF_STATUS_EXTERN,FK_REF_BRANCH,VOLTAGE_LEVEL,PRESSURE_LEVEL,FAILURE_BEGIN,FAILURE_END_PLANNED,FAILURE_END_RESUPPLIED,INTERNAL_REMARK,POSTCODE,CITY,DISTRICT,STREET,HOUSENUMBER,STATION_ID,STATION_DESCRIPTION,STATION_COORDS,FK_REF_RADIUS,LONGITUDE,LATITUDE,OBJECT_REFERENCE_EXTERNAL_SYSTEM,PUBLICATION_STATUS,PUBLICATION_FREETEXT,FK_REF_EXPECTED_REASON,CREATE_DATE,CREATE_USER,MOD_DATE,MOD_USER, + + HACTION, + HDATE, + HUSER + ) + VALUES ( + NEW.ID,NEW.UUID,NEW.VERSION_NUMBER,NEW.FK_REF_FAILURE_CLASSIFICATION,NEW.FK_REF_FAILURE_TYPE,NEW.RESPONSIBILITY,NEW.INTERN_EXTERN,NEW.FK_REF_STATUS_INTERN,NEW.FK_REF_STATUS_EXTERN,NEW.FK_REF_BRANCH,NEW.VOLTAGE_LEVEL,NEW.PRESSURE_LEVEL,NEW.FAILURE_BEGIN,NEW.FAILURE_END_PLANNED,NEW.FAILURE_END_RESUPPLIED,NEW.INTERNAL_REMARK,NEW.POSTCODE,NEW.CITY,NEW.DISTRICT,NEW.STREET,NEW.HOUSENUMBER,NEW.STATION_ID,NEW.STATION_DESCRIPTION,NEW.STATION_COORDS,NEW.FK_REF_RADIUS,NEW.LONGITUDE,NEW.LATITUDE,NEW.OBJECT_REFERENCE_EXTERNAL_SYSTEM,NEW.PUBLICATION_STATUS,NEW.PUBLICATION_FREETEXT,NEW.FK_REF_EXPECTED_REASON,NEW.CREATE_DATE,NEW.CREATE_USER,NEW.MOD_DATE,NEW.MOD_USER, + 2, + current_timestamp, + NEW.MOD_USER + ); + + RETURN NEW; + END; +$BODY$ + LANGUAGE plpgsql VOLATILE + COST 100; +ALTER FUNCTION PUBLIC.TBL_FAILURE_INFORMATION_UPDATE_TRG() + OWNER TO gfi_service; + +DROP TRIGGER IF EXISTS TBL_FAILURE_INFORMATION_UPDATE_TRG ON PUBLIC.TBL_FAILURE_INFORMATION; + +CREATE TRIGGER TBL_FAILURE_INFORMATION_UPDATE_TRG + BEFORE UPDATE + ON PUBLIC.TBL_FAILURE_INFORMATION + FOR EACH ROW + EXECUTE PROCEDURE PUBLIC.TBL_FAILURE_INFORMATION_UPDATE_TRG(); + + + +-- PUBLIC.TBL_FAILURE_INFORMATION DELETE TRIGGER -- +-- <GENERATED CODE!> + +CREATE OR REPLACE FUNCTION PUBLIC.TBL_FAILURE_INFORMATION_DELETE_TRG() + RETURNS trigger AS +$BODY$ + BEGIN + IF TG_OP = 'DELETE' THEN + INSERT INTO HTBL_FAILURE_INFORMATION ( + + ID,UUID,VERSION_NUMBER,FK_REF_FAILURE_CLASSIFICATION,FK_REF_FAILURE_TYPE,RESPONSIBILITY,INTERN_EXTERN,FK_REF_STATUS_INTERN,FK_REF_STATUS_EXTERN,FK_REF_BRANCH,VOLTAGE_LEVEL,PRESSURE_LEVEL,FAILURE_BEGIN,FAILURE_END_PLANNED,FAILURE_END_RESUPPLIED,INTERNAL_REMARK,POSTCODE,CITY,DISTRICT,STREET,HOUSENUMBER,STATION_ID,STATION_DESCRIPTION,STATION_COORDS,FK_REF_RADIUS,LONGITUDE,LATITUDE,OBJECT_REFERENCE_EXTERNAL_SYSTEM,PUBLICATION_STATUS,PUBLICATION_FREETEXT,FK_REF_EXPECTED_REASON,CREATE_DATE,CREATE_USER,MOD_DATE,MOD_USER, + + HACTION, + HDATE, + HUSER + ) + VALUES ( + OLD.ID,OLD.UUID,OLD.VERSION_NUMBER,OLD.FK_REF_FAILURE_CLASSIFICATION,OLD.FK_REF_FAILURE_TYPE,OLD.RESPONSIBILITY,OLD.INTERN_EXTERN,OLD.FK_REF_STATUS_INTERN,OLD.FK_REF_STATUS_EXTERN,OLD.FK_REF_BRANCH,OLD.VOLTAGE_LEVEL,OLD.PRESSURE_LEVEL,OLD.FAILURE_BEGIN,OLD.FAILURE_END_PLANNED,OLD.FAILURE_END_RESUPPLIED, OLD.INTERNAL_REMARK,OLD.POSTCODE,OLD.CITY,OLD.DISTRICT,OLD.STREET,OLD.HOUSENUMBER,OLD.STATION_ID,OLD.STATION_DESCRIPTION,OLD.STATION_COORDS,OLD.FK_REF_RADIUS,OLD.LONGITUDE,OLD.LATITUDE,OLD.OBJECT_REFERENCE_EXTERNAL_SYSTEM,OLD.PUBLICATION_STATUS,OLD.PUBLICATION_FREETEXT,OLD.FK_REF_EXPECTED_REASON,OLD.CREATE_DATE,OLD.CREATE_USER,OLD.MOD_DATE,OLD.MOD_USER, + + 3, + current_timestamp, + OLD.MOD_USER ); + END IF; + + RETURN OLD; + END; +$BODY$ + LANGUAGE plpgsql VOLATILE + COST 100; +ALTER FUNCTION PUBLIC.TBL_FAILURE_INFORMATION_DELETE_TRG() + OWNER TO gfi_service; + +DROP TRIGGER IF EXISTS TBL_FAILURE_INFORMATION_DELETE_TRG ON PUBLIC.TBL_FAILURE_INFORMATION; + +CREATE TRIGGER TBL_FAILURE_INFORMATION_DELETE_TRG + BEFORE DELETE + ON PUBLIC.TBL_FAILURE_INFORMATION + FOR EACH ROW + EXECUTE PROCEDURE PUBLIC.TBL_FAILURE_INFORMATION_DELETE_TRG(); + + + diff --git a/gfsBackendService/src/test/java/org/eclipse/openk/gridfailureinformation/controller/FailureInformationControllerTest.java b/gfsBackendService/src/test/java/org/eclipse/openk/gridfailureinformation/controller/FailureInformationControllerTest.java index 30d924f4017729d3479d0bc79cd392fecdbc2340..2c2aa4879ac0d2627f85bfe9d7ed36523347b453 100644 --- a/gfsBackendService/src/test/java/org/eclipse/openk/gridfailureinformation/controller/FailureInformationControllerTest.java +++ b/gfsBackendService/src/test/java/org/eclipse/openk/gridfailureinformation/controller/FailureInformationControllerTest.java @@ -124,7 +124,6 @@ public class FailureInformationControllerTest { .andExpect(jsonPath("$.internExtern", is(failureInfoDto.getInternExtern()))) .andExpect(jsonPath("$.voltageLevel", is(failureInfoDto.getVoltageLevel()))) .andExpect(jsonPath("$.pressureLevel", is(failureInfoDto.getPressureLevel()))) - .andExpect(jsonPath("$.probableReason", is(failureInfoDto.getProbableReason()))) .andExpect(jsonPath("$.internalRemark", is(failureInfoDto.getInternalRemark()))) .andExpect(jsonPath("$.postcode", is(failureInfoDto.getPostcode()))) .andExpect(jsonPath("$.city", is(failureInfoDto.getCity()))) diff --git a/gfsBackendService/src/test/java/org/eclipse/openk/gridfailureinformation/service/FailureInformationServiceTest.java b/gfsBackendService/src/test/java/org/eclipse/openk/gridfailureinformation/service/FailureInformationServiceTest.java index 2682cfdd54eb6ad9d67366b8df397d9b2908de60..5072e89fa8e2a03ce65d9785a2ec2d6db47d2a9a 100644 --- a/gfsBackendService/src/test/java/org/eclipse/openk/gridfailureinformation/service/FailureInformationServiceTest.java +++ b/gfsBackendService/src/test/java/org/eclipse/openk/gridfailureinformation/service/FailureInformationServiceTest.java @@ -135,7 +135,6 @@ public class FailureInformationServiceTest { assertEquals(fiTbl.getFailureBegin(), savedDto.getFailureBegin()); assertEquals(fiTbl.getFailureEndPlanned(), savedDto.getFailureEndPlanned()); assertEquals(fiTbl.getFailureEndResupplied(), savedDto.getFailureEndResupplied()); - assertEquals(fiTbl.getProbableReason(), savedDto.getProbableReason()); assertEquals(fiTbl.getInternalRemark(), savedDto.getInternalRemark()); assertEquals(fiTbl.getPostcode(), savedDto.getPostcode()); assertEquals(fiTbl.getCity(), savedDto.getCity()); @@ -204,7 +203,6 @@ public class FailureInformationServiceTest { assertEquals(fiTbl.getFailureBegin(), savedDto.getFailureBegin()); assertEquals(fiTbl.getFailureEndPlanned(), savedDto.getFailureEndPlanned()); assertEquals(fiTbl.getFailureEndResupplied(), savedDto.getFailureEndResupplied()); - assertEquals(fiTbl.getProbableReason(), savedDto.getProbableReason()); assertEquals(fiTbl.getInternalRemark(), savedDto.getInternalRemark()); assertEquals(fiTbl.getPostcode(), savedDto.getPostcode()); assertEquals(fiTbl.getCity(), savedDto.getCity()); @@ -447,7 +445,6 @@ public class FailureInformationServiceTest { assertEquals(fiDto.getFailureBegin(), savedDto.getFailureBegin()); assertEquals(fiDto.getFailureEndPlanned(), savedDto.getFailureEndPlanned()); assertEquals(fiDto.getFailureEndResupplied(), savedDto.getFailureEndResupplied()); - assertEquals(fiDto.getProbableReason(), savedDto.getProbableReason()); assertEquals(fiDto.getInternalRemark(), savedDto.getInternalRemark()); assertEquals(fiDto.getPostcode(), savedDto.getPostcode()); assertEquals(fiDto.getCity(), savedDto.getCity()); @@ -569,7 +566,6 @@ public class FailureInformationServiceTest { assertEquals(null, savedCondensedFailureInfoDto.getStreet()); assertEquals(null, savedCondensedFailureInfoDto.getDistrict()); assertEquals(null, savedCondensedFailureInfoDto.getCity()); - assertEquals(null, savedCondensedFailureInfoDto.getProbableReason()); assertEquals(tblFailureInformation1.getFailureBegin(), savedCondensedFailureInfoDto.getFailureBegin()); assertEquals(tblFailureInformation3.getFailureEndPlanned(), savedCondensedFailureInfoDto.getFailureEndPlanned()); assertEquals(true, savedCondensedFailureInfoDto.isCondensed()); diff --git a/gfsBackendService/src/test/java/org/eclipse/openk/gridfailureinformation/support/MockDataHelper.java b/gfsBackendService/src/test/java/org/eclipse/openk/gridfailureinformation/support/MockDataHelper.java index f998d13be26aa94de2e432335048bd87eb8d6d53..a8bbda7d711b91652582ca76da04f7e6a6f3d1f0 100644 --- a/gfsBackendService/src/test/java/org/eclipse/openk/gridfailureinformation/support/MockDataHelper.java +++ b/gfsBackendService/src/test/java/org/eclipse/openk/gridfailureinformation/support/MockDataHelper.java @@ -58,7 +58,7 @@ public class MockDataHelper { dto.setFailureBegin(Date.valueOf("2022-12-01")); dto.setFailureEndPlanned(Date.valueOf("2022-12-02")); dto.setFailureEndResupplied(Date.valueOf("2022-12-03")); - dto.setProbableReason("Über Kabel gestolpert"); + dto.setStreet("Budenweg"); dto.setDistrict("West"); @@ -114,7 +114,6 @@ public class MockDataHelper { obj.setFailureBegin(Date.valueOf("2022-12-01")); obj.setFailureEndPlanned(Date.valueOf("2022-12-02")); obj.setFailureEndResupplied(Date.valueOf("2022-12-03")); - obj.setProbableReason("Über Kabel gestolpert"); obj.setStreet("Budenweg"); obj.setDistrict("West"); @@ -157,7 +156,6 @@ public class MockDataHelper { obj.setFailureBegin(Date.valueOf("2022-08-01")); obj.setFailureEndPlanned(Date.valueOf("2022-09-02")); obj.setFailureEndResupplied(Date.valueOf("2022-09-03")); - obj.setProbableReason("Korrosion"); obj.setStreet("Hügelpfad"); obj.setDistrict("Süd"); @@ -459,7 +457,6 @@ public class MockDataHelper { obj.setFailureBegin(Date.valueOf("2022-12-01")); obj.setFailureEndPlanned(Date.valueOf("2022-12-02")); obj.setFailureEndResupplied(Date.valueOf("2022-12-03")); - obj.setProbableReason("Über Kabel gestolpert"); obj.setStationId("224488-123bcd"); obj.setStationDescription("E-werk 4 Trafo 1"); @@ -498,7 +495,6 @@ public class MockDataHelper { obj.setFailureBegin(Date.valueOf("2022-12-01")); obj.setFailureEndPlanned(Date.valueOf("2022-12-02")); obj.setFailureEndResupplied(Date.valueOf("2022-12-03")); - obj.setProbableReason("Rohrbruch"); obj.setStationId("567az-443bcd"); obj.setStationDescription("Pumpwerk 13"); @@ -543,7 +539,7 @@ public class MockDataHelper { dto.setFailureBegin(Date.valueOf("2022-12-01")); dto.setFailureEndPlanned(Date.valueOf("2022-12-02")); dto.setFailureEndResupplied(Date.valueOf("2022-12-03")); - dto.setProbableReason("Über Kabel gestolpert"); + dto.setStationId("123123-123zzz"); dto.setStationDescription("Umspannwerk 5"); @@ -595,7 +591,6 @@ public class MockDataHelper { dto.setFailureBegin(Date.valueOf("2022-12-01")); dto.setFailureEndPlanned(Date.valueOf("2022-12-02")); dto.setFailureEndResupplied(Date.valueOf("2022-12-03")); - dto.setProbableReason("Über Rohr gestolpert"); dto.setStationId("985236-999bcd"); dto.setStationDescription("Trafo 135");