gfunkus/EON_EOPERATE
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Correct export of Delivery Unit EON_EOPERATE (8 files, replaces incomplete initial export)

Browse Source
This commit is contained in:
Thorsten Schmitz
2026-07-09 12:01:40 +02:00
parent 84e31a40ae
commit a5904910e8
8 changed files with 158 additions and 155 deletions
Download Patch File Download Diff File Expand all files Collapse all files
uniorg/eon/eoperate/meta/2023-04-21_V_CHARGEDATA.sql
+1 -1
View File
@@ -75,7 +75,7 @@ ELSE 'OK'
END as "CHECK_CONTRACT_EXISTS", END as "CHECK_CONTRACT_EXISTS",
(SELECT (SELECT
LAST_VALUE(STATUS LAST_VALUE(STATUS
order by ID) order by ID)
FROM "A19753_EON_P01"."EON_CHARGEDATA" CD FROM "A19753_EON_P01"."EON_CHARGEDATA" CD
WHERE CD.NICE_CDRID = ET.UNIQUE_ID WHERE CD.NICE_CDRID = ET.UNIQUE_ID
AND CD.BILLING_MODE = 'EMP' ) as CHECK_BILLING, AND CD.BILLING_MODE = 'EMP' ) as CHECK_BILLING,
uniorg/eon/eoperate/meta/2023-04-21_V_CHARGEDATA_DUPLICATES.sql
+5 -5
View File
@@ -50,16 +50,16 @@ CREATE VIEW "EOPERATE"."V_CHARGEDATA_DUPLICATES" ( "UNIQUE_ID",
RANK() OVER ( PARTITION BY EMAID, RANK() OVER ( PARTITION BY EMAID,
CHARGEPOINT_ID, CHARGEPOINT_ID,
CHARGE_DATA_BEGIN_UTC CHARGE_DATA_BEGIN_UTC
ORDER BY CHECK_BILLING, ORDER BY CHECK_BILLING,
CHARGE_DATA_CONSUMPTION_KWH DESC, CHARGE_DATA_CONSUMPTION_KWH DESC,
BDR_ID DESC ) AS Rank BDR_ID DESC ) AS Rank
FROM "VALID" V FROM "VALID" V
WHERE EXISTS (SELECT WHERE EXISTS (SELECT
1 1
FROM HAVING_DUPLICATES D FROM HAVING_DUPLICATES D
WHERE D.CHARGEPOINT_ID = V.CHARGEPOINT_ID WHERE D.CHARGEPOINT_ID = V.CHARGEPOINT_ID
AND D.CHARGE_DATA_BEGIN_UTC = V.CHARGE_DATA_BEGIN_UTC AND D.CHARGE_DATA_BEGIN_UTC = V.CHARGE_DATA_BEGIN_UTC
AND D.EMAID = V.EMAID)) SELECT AND D.EMAID = V.EMAID)) SELECT
"D"."UNIQUE_ID" , "D"."UNIQUE_ID" ,
"D"."BDR_ID" , "D"."BDR_ID" ,
"D"."EMAID" , "D"."EMAID" ,
uniorg/eon/eoperate/meta/emobility_view_v15.sql
+1 -1
View File
@@ -12,7 +12,7 @@ ALTER VIEW "EMOBILITY"."V_CHARGEDATA_EMP" ( "ID",
"OPERATORSUBMANDANT", "OPERATORSUBMANDANT",
"FREECHARGE", "FREECHARGE",
"CHARGEPOINTTYPE", "CHARGEPOINTTYPE",
" METERID", "METERID",
"MAXSOCKETPOWER", "MAXSOCKETPOWER",
"ADDRESS", "ADDRESS",
"ZIP", "ZIP",
uniorg/eon/eoperate/meta/emobility_view_v16.sql
+14 -14
View File
@@ -63,10 +63,10 @@ CREATE VIEW "EMOBILITY"."V_CHARGEDATA_EMP" ( "ID",
'OPERATORNAME', 'OPERATORNAME',
'true', 'true',
CASE "FREECHARGING" WHEN 'yes' CASE "FREECHARGING" WHEN 'yes'
THEN 'true' WHEN 'no' THEN 'true' WHEN 'no'
then 'false' then 'false'
ELSE '' ELSE ''
END as FREECHARGE, END as FREECHARGE,
"PLUGTYPE", "PLUGTYPE",
'METERID', 'METERID',
0, 0,
@@ -78,16 +78,16 @@ CREATE VIEW "EMOBILITY"."V_CHARGEDATA_EMP" ( "ID",
'PROVIDERID', 'PROVIDERID',
'PROVIDERNAME', 'PROVIDERNAME',
left("STARTTIME", left("STARTTIME",
19), 19),
left("STOPTIME", left("STOPTIME",
19), 19),
left("STARTTIME", left("STARTTIME",
19), 19),
left("STOPTIME", left("STOPTIME",
19), 19),
IFNULL( "METERSTART", IFNULL( "METERSTART",
0), 0),
@@ -158,11 +158,11 @@ CREATE VIEW "EMOBILITY"."V_CHARGEDATA_EMP" ( "ID",
"BILLING", "BILLING",
'VIRTAPORTAL', 'VIRTAPORTAL',
'V 1.6/25.09.2020' 'V 1.6/25.09.2020'
from "VIRTAPORTAL"."EMP_TRANSACTIONS" from "VIRTAPORTAL"."EMP_TRANSACTIONS"
where "TRANSACTIONTYPE" = 'charge' where "TRANSACTIONTYPE" = 'charge'
and "WATTHOUR" > 0 and "WATTHOUR" > 0
and "DURATION" > 2) and "DURATION" > 2)
UNION ALL (SELECT UNION ALL (SELECT
"ID" , "ID" ,
"CALLID" , "CALLID" ,
"CDRID" , "CDRID" ,
@@ -213,4 +213,4 @@ CREATE VIEW "EMOBILITY"."V_CHARGEDATA_EMP" ( "ID",
"BILLING" , "BILLING" ,
"SYSTYPE" , "SYSTYPE" ,
"VIEWVERSION" "VIEWVERSION"
from "EMOBILITY"."V_CHARGEDATA_EMP_EOPERATE")) WITH READ ONLY from "EMOBILITY"."V_CHARGEDATA_EMP_EOPERATE")) WITH READ ONLY
uniorg/eon/eoperate/meta/emobility_view_v18.sql
+19 -19
View File
@@ -62,15 +62,15 @@ ALTER VIEW "EMOBILITY"."V_CHARGEDATA_EMP" ( "ID",
'OPERATORNAME', 'OPERATORNAME',
'true', 'true',
CASE "FREECHARGING" WHEN 'yes' CASE "FREECHARGING" WHEN 'yes'
THEN 'true' WHEN 'no' THEN 'true' WHEN 'no'
then 'false' then 'false'
ELSE '' ELSE ''
END as FREECHARGE, END as FREECHARGE,
CASE CPOOPERATORID CASE CPOOPERATORID
WHEN 'DE*ION' THEN 'ION' WHEN 'DE*ION' THEN 'ION'
WHEN 'DE*UFC' THEN 'UFC' WHEN 'DE*UFC' THEN 'UFC'
ELSE "PLUGTYPE" ELSE "PLUGTYPE"
END as "PLUGTYPE", END as "PLUGTYPE",
'METERID', 'METERID',
0, 0,
"LOCATION_ADDRESS", "LOCATION_ADDRESS",
@@ -81,16 +81,16 @@ ALTER VIEW "EMOBILITY"."V_CHARGEDATA_EMP" ( "ID",
'PROVIDERID', 'PROVIDERID',
'PROVIDERNAME', 'PROVIDERNAME',
left("STARTTIME", left("STARTTIME",
19), 19),
left("STOPTIME", left("STOPTIME",
19), 19),
left("STARTTIME", left("STARTTIME",
19), 19),
left("STOPTIME", left("STOPTIME",
19), 19),
IFNULL( "METERSTART", IFNULL( "METERSTART",
0), 0),
@@ -161,11 +161,11 @@ ALTER VIEW "EMOBILITY"."V_CHARGEDATA_EMP" ( "ID",
"BILLING", "BILLING",
'VIRTAPORTAL', 'VIRTAPORTAL',
'V 1.8/23.10.2020' 'V 1.8/23.10.2020'
from "VIRTAPORTAL"."EMP_TRANSACTIONS" from "VIRTAPORTAL"."EMP_TRANSACTIONS"
where "TRANSACTIONTYPE" = 'charge' where "TRANSACTIONTYPE" = 'charge'
and "WATTHOUR" > 0 and "WATTHOUR" > 0
and "DURATION" > 2) and "DURATION" > 2)
UNION ALL (SELECT UNION ALL (SELECT
"ID" , "ID" ,
"CALLID" , "CALLID" ,
"CDRID" , "CDRID" ,
@@ -216,4 +216,4 @@ ALTER VIEW "EMOBILITY"."V_CHARGEDATA_EMP" ( "ID",
"BILLING" , "BILLING" ,
"SYSTYPE" , "SYSTYPE" ,
"VIEWVERSION" "VIEWVERSION"
from "EMOBILITY"."V_CHARGEDATA_EMP_EOPERATE")) WITH READ ONLY from "EMOBILITY"."V_CHARGEDATA_EMP_EOPERATE")) WITH READ ONLY
uniorg/eon/eoperate/v1/setchargedata.xsjs
+7 -4
View File
@@ -149,7 +149,11 @@ function checkPayload(inObj) {
) { ) {
isValid = false; isValid = false;
reason = reason =
" (mandatory properties are: BDR_ID, EMAID, CREATION_DATE_UTC, CHARGEPOINT.ID, CHARGEPOINT.TYPE, \nCHARGEPOINT.METER_ID, CHARGEPOINT.ADDRESS.COUNTRY, CHARGEPOINT.ADDRESS.POSTALCODE, CHARGEPOINT.ADDRESS.CITY, \nCHARGEPOINT.ADDRESS.COUNTRY, CHARGEPOINT_OPERATOR.ID, CHARGEPOINT_OPERATOR.NAME, EMOBILITY_PROVIDER.ID, \nEMOBILITY_PROVIDER.NAME, CHARGE_DATA.AUTHORIZATION_TYPE, CHARGE_DATA.CONSUMPTION_KWH, CHARGE_DATA.BEGIN_UTC, \nCHARGE_DATA.END_UTC, CHARGE_DATA.TIME_ZONE, PRICING.ITEMS[])"; " (mandatory properties are: BDR_ID, EMAID, CREATION_DATE_UTC, CHARGEPOINT.ID, CHARGEPOINT.TYPE, \
CHARGEPOINT.METER_ID, CHARGEPOINT.ADDRESS.COUNTRY, CHARGEPOINT.ADDRESS.POSTALCODE, CHARGEPOINT.ADDRESS.CITY, \
CHARGEPOINT.ADDRESS.COUNTRY, CHARGEPOINT_OPERATOR.ID, CHARGEPOINT_OPERATOR.NAME, EMOBILITY_PROVIDER.ID, \
EMOBILITY_PROVIDER.NAME, CHARGE_DATA.AUTHORIZATION_TYPE, CHARGE_DATA.CONSUMPTION_KWH, CHARGE_DATA.BEGIN_UTC, \
CHARGE_DATA.END_UTC, CHARGE_DATA.TIME_ZONE, PRICING.ITEMS[])";
} else { } else {
cdrObj.PRICING.ITEMS.forEach(function(pricingItem) { cdrObj.PRICING.ITEMS.forEach(function(pricingItem) {
if (!pricingItem.hasOwnProperty('TYPE') || !pricingItem.hasOwnProperty('UNIT') || !pricingItem.hasOwnProperty('UNIT_PRICE') || ! if (!pricingItem.hasOwnProperty('TYPE') || !pricingItem.hasOwnProperty('UNIT') || !pricingItem.hasOwnProperty('UNIT_PRICE') || !
@@ -185,7 +189,7 @@ function PutDataInTable() {
outMsg = {}; outMsg = {};
outMsg.method = "saveData"; outMsg.method = "saveData";
var pdcontent = $.request.body.asString(); var pdcontent = $.request.body.asString();
// pdcontent = pdcontent.replace(/\"([^(\")\"]+)\":/g,"$1:"); // pdcontent = pdcontent.replace(/\"([^(\")"]+)\":/g,"$1:");
var pdcdrObj = JSON.parse(pdcontent); var pdcdrObj = JSON.parse(pdcontent);
var conn = $.db.getConnection(); var conn = $.db.getConnection();
var pstmt; var pstmt;
@@ -197,8 +201,7 @@ function PutDataInTable() {
var isUpdateMode = false; var isUpdateMode = false;
// var query2; // var query2;
// var output = {results: [] }; // var output = {results: [] };
// // var mynextval = getnextval();
// var mynextval = getnextval();
// myDebug.mynextval = mynextval; // myDebug.mynextval = mynextval;
try { try {
var myBDRID = pdcdrObj[0].BDR_ID.toString(); var myBDRID = pdcdrObj[0].BDR_ID.toString();