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",
(SELECT
LAST_VALUE(STATUS
order by ID)
order by ID)
FROM "A19753_EON_P01"."EON_CHARGEDATA" CD
WHERE CD.NICE_CDRID = ET.UNIQUE_ID
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,
CHARGEPOINT_ID,
CHARGE_DATA_BEGIN_UTC
ORDER BY CHECK_BILLING,
ORDER BY CHECK_BILLING,
CHARGE_DATA_CONSUMPTION_KWH DESC,
BDR_ID DESC ) AS Rank
FROM "VALID" V
WHERE EXISTS (SELECT
1
FROM HAVING_DUPLICATES D
WHERE D.CHARGEPOINT_ID = V.CHARGEPOINT_ID
AND D.CHARGE_DATA_BEGIN_UTC = V.CHARGE_DATA_BEGIN_UTC
AND D.EMAID = V.EMAID)) SELECT
FROM HAVING_DUPLICATES D
WHERE D.CHARGEPOINT_ID = V.CHARGEPOINT_ID
AND D.CHARGE_DATA_BEGIN_UTC = V.CHARGE_DATA_BEGIN_UTC
AND D.EMAID = V.EMAID)) SELECT
"D"."UNIQUE_ID" ,
"D"."BDR_ID" ,
"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",
"FREECHARGE",
"CHARGEPOINTTYPE",
" METERID",
"METERID",
"MAXSOCKETPOWER",
"ADDRESS",
"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',
'true',
CASE "FREECHARGING" WHEN 'yes'
THEN 'true' WHEN 'no'
then 'false'
ELSE ''
END as FREECHARGE,
THEN 'true' WHEN 'no'
then 'false'
ELSE ''
END as FREECHARGE,
"PLUGTYPE",
'METERID',
0,
@@ -78,16 +78,16 @@ CREATE VIEW "EMOBILITY"."V_CHARGEDATA_EMP" ( "ID",
'PROVIDERID',
'PROVIDERNAME',
left("STARTTIME",
left("STARTTIME",
19),
left("STOPTIME",
left("STOPTIME",
19),
left("STARTTIME",
left("STARTTIME",
19),
left("STOPTIME",
left("STOPTIME",
19),
IFNULL( "METERSTART",
0),
@@ -158,11 +158,11 @@ CREATE VIEW "EMOBILITY"."V_CHARGEDATA_EMP" ( "ID",
"BILLING",
'VIRTAPORTAL',
'V 1.6/25.09.2020'
from "VIRTAPORTAL"."EMP_TRANSACTIONS"
where "TRANSACTIONTYPE" = 'charge'
and "WATTHOUR" > 0
and "DURATION" > 2)
UNION ALL (SELECT
from "VIRTAPORTAL"."EMP_TRANSACTIONS"
where "TRANSACTIONTYPE" = 'charge'
and "WATTHOUR" > 0
and "DURATION" > 2)
UNION ALL (SELECT
"ID" ,
"CALLID" ,
"CDRID" ,
@@ -213,4 +213,4 @@ CREATE VIEW "EMOBILITY"."V_CHARGEDATA_EMP" ( "ID",
"BILLING" ,
"SYSTYPE" ,
"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',
'true',
CASE "FREECHARGING" WHEN 'yes'
THEN 'true' WHEN 'no'
then 'false'
ELSE ''
END as FREECHARGE,
CASE CPOOPERATORID
WHEN 'DE*ION' THEN 'ION'
WHEN 'DE*UFC' THEN 'UFC'
ELSE "PLUGTYPE"
END as "PLUGTYPE",
THEN 'true' WHEN 'no'
then 'false'
ELSE ''
END as FREECHARGE,
CASE CPOOPERATORID
WHEN 'DE*ION' THEN 'ION'
WHEN 'DE*UFC' THEN 'UFC'
ELSE "PLUGTYPE"
END as "PLUGTYPE",
'METERID',
0,
"LOCATION_ADDRESS",
@@ -81,16 +81,16 @@ ALTER VIEW "EMOBILITY"."V_CHARGEDATA_EMP" ( "ID",
'PROVIDERID',
'PROVIDERNAME',
left("STARTTIME",
left("STARTTIME",
19),
left("STOPTIME",
left("STOPTIME",
19),
left("STARTTIME",
left("STARTTIME",
19),
left("STOPTIME",
left("STOPTIME",
19),
IFNULL( "METERSTART",
0),
@@ -161,11 +161,11 @@ ALTER VIEW "EMOBILITY"."V_CHARGEDATA_EMP" ( "ID",
"BILLING",
'VIRTAPORTAL',
'V 1.8/23.10.2020'
from "VIRTAPORTAL"."EMP_TRANSACTIONS"
where "TRANSACTIONTYPE" = 'charge'
and "WATTHOUR" > 0
and "DURATION" > 2)
UNION ALL (SELECT
from "VIRTAPORTAL"."EMP_TRANSACTIONS"
where "TRANSACTIONTYPE" = 'charge'
and "WATTHOUR" > 0
and "DURATION" > 2)
UNION ALL (SELECT
"ID" ,
"CALLID" ,
"CDRID" ,
@@ -216,4 +216,4 @@ ALTER VIEW "EMOBILITY"."V_CHARGEDATA_EMP" ( "ID",
"BILLING" ,
"SYSTYPE" ,
"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;
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 {
cdrObj.PRICING.ITEMS.forEach(function(pricingItem) {
if (!pricingItem.hasOwnProperty('TYPE') || !pricingItem.hasOwnProperty('UNIT') || !pricingItem.hasOwnProperty('UNIT_PRICE') || !
@@ -185,7 +189,7 @@ function PutDataInTable() {
outMsg = {};
outMsg.method = "saveData";
var pdcontent = $.request.body.asString();
// pdcontent = pdcontent.replace(/\"([^(\")\"]+)\":/g,"$1:");
// pdcontent = pdcontent.replace(/\"([^(\")"]+)\":/g,"$1:");
var pdcdrObj = JSON.parse(pdcontent);
var conn = $.db.getConnection();
var pstmt;
@@ -197,8 +201,7 @@ function PutDataInTable() {
var isUpdateMode = false;
// var query2;
// var output = {results: [] };
//
// var mynextval = getnextval();
// var mynextval = getnextval();
// myDebug.mynextval = mynextval;
try {
var myBDRID = pdcdrObj[0].BDR_ID.toString();