admin/Database
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

FLEX#64717 geschedulede commando's laatste fase

Browse Source 
svn path=/Database/trunk/; revision=49693
This commit is contained in:
Peter Feij
2021-02-05 09:43:07 +00:00
parent 4766af5803
commit 8d9afb01ae
3 changed files with 26 additions and 31 deletions
Download Patch File Download Diff File Expand all files Collapse all files

43
FAC/FAC_PAC.SRC
View File

@@ -106,20 +106,19 @@ CREATE OR REPLACE PACKAGE fac
PROCEDURE imp_mld_delete_mld (p_import_key IN NUMBER, p_mode IN NUMBER);
PROCEDURE fac_perfmon_incr(limiet IN NUMBER, zwaarte IN NUMBER);
PROCEDURE putnotificationprio (pfrom NUMBER, pto NUMBER, pmessage VARCHAR2, pmode NUMBER,
poptemail VARCHAR2, poptmobile VARCHAR2, pprio NUMBER, pattach VARCHAR2 DEFAULT NULL, pbedrijfadreskey NUMBER DEFAULT NULL, pqueue VARCHAR DEFAULT NULL);
poptemail VARCHAR2, poptmobile VARCHAR2, pprio NUMBER, pattach VARCHAR2 DEFAULT NULL, pbedrijfadreskey NUMBER DEFAULT NULL, pqueue VARCHAR DEFAULT 'DEFAULT');
PROCEDURE putnotification (pfrom NUMBER, pto NUMBER, pmessage VARCHAR2, pmode NUMBER,
poptemail VARCHAR2, poptmobile VARCHAR2);
PROCEDURE putsystemnotification (pmessage VARCHAR2, pmode NUMBER);
PROCEDURE putnotificationsrtprio (pfrom NUMBER, pto NUMBER, pcode VARCHAR2, pref NUMBER,
poptmessage VARCHAR2, poptstatus NUMBER, poptemail VARCHAR2, poptmobile VARCHAR2, pxref NUMBER,
pprio NUMBER, psender VARCHAR2, pattach VARCHAR2 DEFAULT NULL, pbedrijfadreskey NUMBER DEFAULT NULL, pqueue VARCHAR DEFAULT NULL);
pprio NUMBER, psender VARCHAR2, pattach VARCHAR2 DEFAULT NULL, pbedrijfadreskey NUMBER DEFAULT NULL, pqueue VARCHAR DEFAULT 'DEFAULT');
PROCEDURE clrnotifications (pcode VARCHAR2, pref NUMBER, pxref NUMBER DEFAULT NULL, puitz VARCHAR2 DEFAULT NULL, puitz2 VARCHAR2 DEFAULT NULL);
PROCEDURE clrnotifications (pcode VARCHAR2, pref NUMBER, psubject VARCHAR2, preceiver NUMBER, pextrakey NUMBER);
PROCEDURE clrnotifications_xmlnode (pxmlnode VARCHAR2, prefkey NUMBER);
PROCEDURE clrtracking_xmlnode (pxmlnode VARCHAR2, prefkey NUMBER);
PROCEDURE putnotificationjobs (pflags NUMBER DEFAULT NULL);
PROCEDURE putnotificationjobs (pcust VARCHAR2);
PROCEDURE putjobnotifications (pviewname VARCHAR2, pmode NUMBER, pflags NUMBER, pqueue VARCHAR DEFAULT NULL);
PROCEDURE putnotificationjobs (pqueue VARCHAR2 DEFAULT 'DEFAULT');
PROCEDURE putjobnotifications (pviewname VARCHAR2, pmode NUMBER, pflags NUMBER, pqueue VARCHAR DEFAULT 'DEFAULT');
FUNCTION getEmail ( pkey IN NUMBER ) RETURN VARCHAR2;
FUNCTION getMobile ( pkey IN NUMBER ) RETURN VARCHAR2;
PROCEDURE fac_nightly;
@@ -2017,7 +2016,7 @@ CREATE OR REPLACE PACKAGE BODY fac AS
-- Bij een interne ontvanger wordt diens taal bijgezocht.
PROCEDURE putnotificationprio (pfrom NUMBER, pto NUMBER, pmessage VARCHAR2, pmode NUMBER,
poptemail VARCHAR2, poptmobile VARCHAR2, pprio NUMBER, pattach VARCHAR2 DEFAULT NULL,
pbedrijfadreskey NUMBER DEFAULT NULL, pqueue VARCHAR DEFAULT NULL)
pbedrijfadreskey NUMBER DEFAULT NULL, pqueue VARCHAR DEFAULT 'DEFAULT')
AS
lemail prs_perslid.prs_perslid_email%TYPE;
lphone prs_perslid.prs_perslid_mobiel%TYPE;
@@ -2075,12 +2074,12 @@ CREATE OR REPLACE PACKAGE BODY fac AS
(fac_srtnotificatie_key, fac_notificatie_status, prs_perslid_key_sender, prs_perslid_key_receiver,
fac_notificatie_receiver_email, fac_notificatie_receiver_phone, fac_notificatie_oms,
fac_notificatie_refkey, fac_notificatie_prioriteit, fac_notificatie_lang, fac_notificatie_systeemadres,
fac_notificatie_attachments, prs_bedrijfadres_key
fac_notificatie_attachments, prs_bedrijfadres_key, fac_notificatie_queue
)
VALUES (NULL, lmode, pfrom, pto,
lemail, lphone, SUBSTR(pmessage, 1, 2048),
NULL, pprio, llang, lsysteem,
pattach, pbedrijfadreskey
pattach, pbedrijfadreskey, pqueue
);
END IF;
END;
@@ -2131,7 +2130,7 @@ CREATE OR REPLACE PACKAGE BODY fac AS
psender VARCHAR2,
pattach VARCHAR2 DEFAULT NULL,
pbedrijfadreskey NUMBER DEFAULT NULL,
pqueue VARCHAR DEFAULT NULL)
pqueue VARCHAR DEFAULT 'DEFAULT')
AS
soms fac_srtnotificatie.fac_srtnotificatie_oms%TYPE;
smode fac_srtnotificatie.fac_srtnotificatie_mode%TYPE;
@@ -2385,7 +2384,8 @@ CREATE OR REPLACE PACKAGE BODY fac AS
fac_notificatie_sender_email,
fac_notificatie_lang,
fac_notificatie_systeemadres,
fac_notificatie_attachments)
fac_notificatie_attachments,
fac_notificatie_queue)
VALUES (skey,
lmode,
pfrom,
@@ -2399,7 +2399,8 @@ CREATE OR REPLACE PACKAGE BODY fac AS
psender,
llang,
lsysteem,
pattach);
pattach,
pqueue);
END IF;
END;
@@ -2473,32 +2474,24 @@ CREATE OR REPLACE PACKAGE BODY fac AS
AND ft.fac_tracking_refkey = prefkey);
END;
-- CUST is inmiddels overbodig, nog voor compatibiliteit only
PROCEDURE putnotificationjobs (pcust VARCHAR2)
AS
BEGIN
fac.putnotificationjobs(223); --dat is alles behalve de bedrijfsadresdingen (255-32)
END;
-- Kijk welke jobs gescheduled zijn en nu uitgevoerd moeten worden.
-- Optioneel kun je pflags meegeven om bepaalde soort jobs in of uit te sluiten
-- De oorspronkelijke notificatie krijg je bv met "niet-32", alleen de bedrijfsadresjobs met 32
PROCEDURE putnotificationjobs (pflags NUMBER DEFAULT NULL)
-- Dit kan ook voor een specifieke jobqueue (niet voor meerdere queue's tegelijk)
PROCEDURE putnotificationjobs (pqueue VARCHAR DEFAULT 'DEFAULT')
AS
CURSOR c1
IS
SELECT fac_notificatie_job_key, fac_notificatie_job_view, fac_notificatie_job_oms,
fac_notificatie_job_interval, fac_notificatie_job_mode, fac_notificatie_job_nextrun,
fac_notificatie_job_flags, fac_notificatie_job_seconds, fac_notificatie_job_queue
fac_notificatie_job_flags, fac_notificatie_job_seconds
FROM fac_notificatie_job
WHERE (fac_notificatie_job_nextrun <= SYSDATE OR fac_notificatie_job_nextrun IS NULL) -- eerste keer
AND (pflags IS NULL OR BITAND(fac_notificatie_job_flags, pflags) > 0); -- nog te testen ivm performance
AND fac_notificatie_job_queue = pqueue;
tnextrun fac_notificatie_job.fac_notificatie_job_nextrun%TYPE;
BEGIN
FOR rec1 IN c1
LOOP
-- Voer de job uit
putjobnotifications (rec1.fac_notificatie_job_view, rec1.fac_notificatie_job_mode, rec1.fac_notificatie_job_flags, rec1.fac_notificatie_job_queue);
putjobnotifications (rec1.fac_notificatie_job_view, rec1.fac_notificatie_job_mode, rec1.fac_notificatie_job_flags, pqueue);
UPDATE fac_notificatie_job
SET fac_notificatie_job_lastrun = SYSDATE
@@ -2538,7 +2531,7 @@ CREATE OR REPLACE PACKAGE BODY fac AS
END;
-- Voer nu job met pviewname uit, die kennelijk nu aan de beurt is
PROCEDURE putjobnotifications (pviewname VARCHAR2, pmode NUMBER, pflags NUMBER, pqueue VARCHAR DEFAULT NULL)
PROCEDURE putjobnotifications (pviewname VARCHAR2, pmode NUMBER, pflags NUMBER, pqueue VARCHAR DEFAULT 'DEFAULT')
AS
TYPE noticursortype IS REF CURSOR;

8
FAC/FAC_TAB.SRC
View File

@@ -608,7 +608,8 @@ CREATE_TABLE(fac_notificatie, 0)
NUMBER(3)
NOT_NULL(fac_notificatie_status, fac_c_fac_notificatie_status),
fac_notificatie_queue
VARCHAR2(20),
VARCHAR2(20)
DEFAULT 'DEFAULT' NOT NULL,
// Note: these columns are defined in PRS_TAB.SRC
// prs_perslid_key_sender
// NUMBER(10)
@@ -672,12 +673,13 @@ CREATE_TABLE(fac_notificatie_job, 0)
fac_notificatie_job_seconds
NUMBER(5),
fac_notificatie_job_queue
VARCHAR2(20),
VARCHAR2(20)
DEFAULT 'DEFAULT' NOT NULL,
fac_notificatie_job_nextrun
DATE,
fac_notificatie_job_lastrun
DATE
, CONSTRAINT fac_c_notificatie_job1 CHECK(fac_notificatie_job_interval IS NOT NULL OR fac_notificatie_job_seconds IS NOT NULL)
, CONSTRAINT fac_c_notificatie_job1 CHECK((fac_notificatie_job_interval IS NOT NULL AND fac_notificatie_job_seconds IS NULL) OR (fac_notificatie_job_interval IS NULL AND fac_notificatie_job_seconds IS NOT NULL))
);
/* Welke importapps bestaan er */
CREATE_TABLE(fac_import_app, 0)

6
_UP/DB39to40.src
View File

@@ -326,9 +326,9 @@ ALTER TABLE fac_notificatie ADD prs_bedrijfadres_key
REFERENCES prs_bedrijfadres(prs_bedrijfadres_key) ON DELETE CASCADE;
ALTER TABLE fac_notificatie_job ADD fac_notificatie_job_seconds NUMBER(5);
ALTER TABLE fac_notificatie_job ADD CONSTRAINT fac_c_notificatie_job1 CHECK(fac_notificatie_job_interval IS NOT NULL OR fac_notificatie_job_seconds IS NOT NULL);
ALTER TABLE fac_notificatie_job ADD fac_notificatie_job_queue VARCHAR2(20);
ALTER TABLE fac_notificatie ADD fac_notificatie_queue VARCHAR2(20);
ALTER TABLE fac_notificatie_job ADD CONSTRAINT fac_c_notificatie_job1 CHECK((fac_notificatie_job_interval IS NOT NULL AND fac_notificatie_job_seconds IS NULL) OR (fac_notificatie_job_interval IS NULL AND fac_notificatie_job_seconds IS NOT NULL));
ALTER TABLE fac_notificatie_job ADD fac_notificatie_job_queue VARCHAR2(20) DEFAULT 'DEFAULT' NOT NULL;
ALTER TABLE fac_notificatie ADD fac_notificatie_queue VARCHAR2(20) DEFAULT 'DEFAULT' NOT NULL;
/////////////////////////////////////////////////////////////////////////////////////////// YKPN#64730
ALTER TABLE res_activiteit DROP CONSTRAINT res_c_activiteit_aantal;