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
+23 -23
View File
@@ -54,35 +54,35 @@ CREATE VIEW "EOPERATE"."V_CHARGEDATA" ( "CHECK_CONSUMED_WATTHOUR",
"UPDATE_TS", "UPDATE_TS",
"CREATE_USER", "CREATE_USER",
"UPDATE_USER" ) AS WITH "EVDRV" AS (select "UPDATE_USER" ) AS WITH "EVDRV" AS (select
distinct U_EOPERATE_ID distinct U_EOPERATE_ID
from "A19753_EON_P01"."@EON_CONTRACT_EVDRV" from "A19753_EON_P01"."@EON_CONTRACT_EVDRV"
where U_EOPERATE_ID <> '') SELECT where U_EOPERATE_ID <> '') SELECT
CASE WHEN CHARGE_DATA_CONSUMPTION_KWH > 120 CASE WHEN CHARGE_DATA_CONSUMPTION_KWH > 120
OR CHARGE_DATA_CONSUMPTION_KWH = 0 OR CHARGE_DATA_CONSUMPTION_KWH = 0
THEN 'INVALID' THEN 'INVALID'
ELSE 'OK' ELSE 'OK'
END as "CHECK_CONSUMED_WATTHOUR", END as "CHECK_CONSUMED_WATTHOUR",
CASE WHEN CHARGE_DATA_BEGIN_UTC IS NULL CASE WHEN CHARGE_DATA_BEGIN_UTC IS NULL
THEN 'NULL' WHEN CHARGE_DATA_BEGIN_UTC = CHARGE_DATA_END_UTC THEN 'NULL' WHEN CHARGE_DATA_BEGIN_UTC = CHARGE_DATA_END_UTC
THEN 'EQUAL' WHEN CHARGE_DATA_END_UTC < CHARGE_DATA_BEGIN_UTC THEN 'EQUAL' WHEN CHARGE_DATA_END_UTC < CHARGE_DATA_BEGIN_UTC
THEN 'INVALID' THEN 'INVALID'
ELSE 'OK' ELSE 'OK'
END AS "CHECK_START_STOP", END AS "CHECK_START_STOP",
'OK' AS "CHECK_DURATION", 'OK' AS "CHECK_DURATION",
CASE WHEN EVDRV.U_EOPERATE_ID IS NULL CASE WHEN EVDRV.U_EOPERATE_ID IS NULL
THEN 'NO CONTRACT' THEN 'NO CONTRACT'
ELSE 'OK' 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,
(SELECT (SELECT
MAX(ID ) MAX(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 BILLING_ID, AND CD.BILLING_MODE = 'EMP' ) as BILLING_ID,
"BDR_ID", "BDR_ID",
"EMAID", "EMAID",
@@ -133,6 +133,6 @@ END as "CHECK_CONTRACT_EXISTS",
"CREATE_TS", "CREATE_TS",
"UPDATE_TS", "UPDATE_TS",
"CREATE_USER", "CREATE_USER",
"UPDATE_USER" "UPDATE_USER"
from "EOPERATE"."CHARGEDATA" ET from "EOPERATE"."CHARGEDATA" ET
LEFT OUTER join EVDRV on ET."EMAID" = EVDRV.U_EOPERATE_ID WITH READ ONLY LEFT OUTER join EVDRV on ET."EMAID" = EVDRV.U_EOPERATE_ID WITH READ ONLY
uniorg/eon/eoperate/meta/2023-04-21_V_CHARGEDATA_DUPLICATES.sql
+20 -20
View File
@@ -19,19 +19,19 @@ CREATE VIEW "EOPERATE"."V_CHARGEDATA_DUPLICATES" ( "UNIQUE_ID",
IFNULL(CHECK_BILLING, IFNULL(CHECK_BILLING,
'Z') AS CHECK_BILLING, 'Z') AS CHECK_BILLING,
CREATE_TS, CREATE_TS,
UPDATE_TS UPDATE_TS
FROM "EOPERATE"."V_CHARGEDATA" AS V FROM "EOPERATE"."V_CHARGEDATA" AS V
WHERE CHECK_CONTRACT_EXISTS = 'OK' --AND CHECK_CONSUMED_WATTHOUR = 'OK' WHERE CHECK_CONTRACT_EXISTS = 'OK' --AND CHECK_CONSUMED_WATTHOUR = 'OK'
--AND CHECK_START_STOP = 'OK' --AND CHECK_START_STOP = 'OK'
AND CHECK_DURATION = 'OK' AND CHECK_DURATION = 'OK'
AND UPDATE_TS > '20220101'), AND UPDATE_TS > '20220101'),
"HAVING_DUPLICATES" AS (SELECT "HAVING_DUPLICATES" AS (SELECT
EMAID, EMAID,
CHARGEPOINT_ID, CHARGEPOINT_ID,
CHARGE_DATA_BEGIN_UTC, CHARGE_DATA_BEGIN_UTC,
COUNT(*) AS DUPLICATES COUNT(*) AS DUPLICATES
FROM VALID FROM VALID
GROUP BY EMAID, GROUP BY EMAID,
CHARGEPOINT_ID, CHARGEPOINT_ID,
CHARGE_DATA_BEGIN_UTC HAVING COUNT(*) > 1), CHARGE_DATA_BEGIN_UTC HAVING COUNT(*) > 1),
@@ -49,17 +49,17 @@ CREATE VIEW "EOPERATE"."V_CHARGEDATA_DUPLICATES" ( "UNIQUE_ID",
"V"."UPDATE_TS" , "V"."UPDATE_TS" ,
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" ,
@@ -71,9 +71,9 @@ CREATE VIEW "EOPERATE"."V_CHARGEDATA_DUPLICATES" ( "UNIQUE_ID",
'Z') AS CHECK_BILLING, 'Z') AS CHECK_BILLING,
"D"."CREATE_TS" , "D"."CREATE_TS" ,
"D"."UPDATE_TS" , "D"."UPDATE_TS" ,
"D"."RANK" "D"."RANK"
FROM "DUPLICATE_WITH_RANK" D FROM "DUPLICATE_WITH_RANK" D
WHERE UPDATE_TS > '20230101' WHERE UPDATE_TS > '20230101'
ORDER BY D.CHARGE_DATA_BEGIN_UTC DESC , ORDER BY D.CHARGE_DATA_BEGIN_UTC DESC ,
D.CHARGEPOINT_ID, D.CHARGEPOINT_ID,
D.RANK WITH READ ONLY D.RANK WITH READ ONLY
uniorg/eon/eoperate/meta/create_emobilityview_eoperate.sql
+45 -45
View File
@@ -1,9 +1,9 @@
ALTER VIEW "EMOBILITY"."V_CHARGEDATA_EMP_EOPERATE" ( "ID", "CALLID", "CDRID", "EVSEID", "CONTRACTID", "RFID", "INSTANCE", "TOKENTYPE", "CONSUMEDENERGY", ALTER VIEW "EMOBILITY"."V_CHARGEDATA_EMP_EOPERATE" ( "ID", "CALLID", "CDRID", "EVSEID", "CONTRACTID", "RFID", "INSTANCE", "TOKENTYPE", "CONSUMEDENERGY",
"OPERATORID", "OPERATORNAME", "OPERATORSUBMANDANT", "FREECHARGE", "CHARGEPOINTTYPE", "METERID", "MAXSOCKETPOWER", "ADDRESS", "ZIP", "CITY", "COUNTRY", "PROVIDERID", "OPERATORID", "OPERATORNAME", "OPERATORSUBMANDANT", "FREECHARGE", "CHARGEPOINTTYPE", "METERID", "MAXSOCKETPOWER", "ADDRESS", "ZIP", "CITY", "COUNTRY", "PROVIDERID",
"PROVIDERNAME", "CHARGINGSTARTTIME", "CHARGINGSTOPTIME", "PARKINGSTARTTIME", "PARKINGSTOPTIME", "METERSTART", "METERSTOP", "TARIFF", "CURRENCY", "VAT", "PROVIDERNAME", "CHARGINGSTARTTIME", "CHARGINGSTOPTIME", "PARKINGSTARTTIME", "PARKINGSTOPTIME", "METERSTART", "METERSTOP", "TARIFF", "CURRENCY", "VAT",
"BILLINGVALUEBRUTTO", "BILLINGVALUENETTO", "PARKINGTIMEPRICEBRUTTO", "PARKINGTIMEPRICENETTO", "ADITIONALPRICEBRUTTO", "ADITIONALPRICENETTO", "KWHNETPRICE", "BILLINGVALUEBRUTTO", "BILLINGVALUENETTO", "PARKINGTIMEPRICEBRUTTO", "PARKINGTIMEPRICENETTO", "ADITIONALPRICEBRUTTO", "ADITIONALPRICENETTO", "KWHNETPRICE",
"MINUTENETPRICE", "SESSIONNETPRICE", "DURATION", "EICHRECHTTYPE", "MILEAGE", "SUBSCRIPTION_ID", "CREATE_TS", "UPDATE_TS", "STATUS", "BILLING", "SYSTYPE", "VIEWVERSION" "MINUTENETPRICE", "SESSIONNETPRICE", "DURATION", "EICHRECHTTYPE", "MILEAGE", "SUBSCRIPTION_ID", "CREATE_TS", "UPDATE_TS", "STATUS", "BILLING", "SYSTYPE", "VIEWVERSION"
) AS ) AS
select select
'EOP' || "BDR_ID", 'EOP' || "BDR_ID",
"BDR_ID", "BDR_ID",
@@ -34,53 +34,53 @@ select
0, 0,
0, 0,
'TARIFF', 'TARIFF',
CASE CASE
WHEN "PRICING_ITEMS_1_TYPE" = 'CUS' THEN "PRICING_ITEMS_1_CURRENCY" WHEN "PRICING_ITEMS_1_TYPE" = 'CUS' THEN "PRICING_ITEMS_1_CURRENCY"
WHEN "PRICING_ITEMS_2_TYPE" = 'CUS' THEN "PRICING_ITEMS_2_CURRENCY" WHEN "PRICING_ITEMS_2_TYPE" = 'CUS' THEN "PRICING_ITEMS_2_CURRENCY"
WHEN "PRICING_ITEMS_3_TYPE" = 'CUS' THEN "PRICING_ITEMS_3_CURRENCY" WHEN "PRICING_ITEMS_3_TYPE" = 'CUS' THEN "PRICING_ITEMS_3_CURRENCY"
WHEN "PRICING_ITEMS_4_TYPE" = 'CUS' THEN "PRICING_ITEMS_4_CURRENCY" WHEN "PRICING_ITEMS_4_TYPE" = 'CUS' THEN "PRICING_ITEMS_4_CURRENCY"
ELSE NULL ELSE NULL
END, END,
0, 0,
0, 0,
CASE CASE
WHEN "PRICING_ITEMS_1_TYPE" = 'CUS' THEN "PRICING_ITEMS_1_NET_AMOUNT" WHEN "PRICING_ITEMS_1_TYPE" = 'CUS' THEN "PRICING_ITEMS_1_NET_AMOUNT"
WHEN "PRICING_ITEMS_2_TYPE" = 'CUS' THEN "PRICING_ITEMS_2_NET_AMOUNT" WHEN "PRICING_ITEMS_2_TYPE" = 'CUS' THEN "PRICING_ITEMS_2_NET_AMOUNT"
WHEN "PRICING_ITEMS_3_TYPE" = 'CUS' THEN "PRICING_ITEMS_3_NET_AMOUNT" WHEN "PRICING_ITEMS_3_TYPE" = 'CUS' THEN "PRICING_ITEMS_3_NET_AMOUNT"
WHEN "PRICING_ITEMS_4_TYPE" = 'CUS' THEN "PRICING_ITEMS_4_NET_AMOUNT" WHEN "PRICING_ITEMS_4_TYPE" = 'CUS' THEN "PRICING_ITEMS_4_NET_AMOUNT"
ELSE NULL ELSE NULL
END, END,
0, 0,
0, 0,
0, 0,
0, 0,
CASE CASE
WHEN "PRICING_ITEMS_1_TYPE" = 'CUS' AND "PRICING_ITEMS_1_UNIT" = 'KWH' THEN "PRICING_ITEMS_1_UNIT_PRICE" WHEN "PRICING_ITEMS_1_TYPE" = 'CUS' AND "PRICING_ITEMS_1_UNIT" = 'KWH' THEN "PRICING_ITEMS_1_UNIT_PRICE"
WHEN "PRICING_ITEMS_2_TYPE" = 'CUS' AND "PRICING_ITEMS_2_UNIT" = 'KWH' THEN "PRICING_ITEMS_2_UNIT_PRICE" WHEN "PRICING_ITEMS_2_TYPE" = 'CUS' AND "PRICING_ITEMS_2_UNIT" = 'KWH' THEN "PRICING_ITEMS_2_UNIT_PRICE"
WHEN "PRICING_ITEMS_3_TYPE" = 'CUS' AND "PRICING_ITEMS_3_UNIT" = 'KWH' THEN "PRICING_ITEMS_3_UNIT_PRICE" WHEN "PRICING_ITEMS_3_TYPE" = 'CUS' AND "PRICING_ITEMS_3_UNIT" = 'KWH' THEN "PRICING_ITEMS_3_UNIT_PRICE"
WHEN "PRICING_ITEMS_4_TYPE" = 'CUS' AND "PRICING_ITEMS_4_UNIT" = 'KWH' THEN "PRICING_ITEMS_4_UNIT_PRICE" WHEN "PRICING_ITEMS_4_TYPE" = 'CUS' AND "PRICING_ITEMS_4_UNIT" = 'KWH' THEN "PRICING_ITEMS_4_UNIT_PRICE"
ELSE NULL ELSE NULL
END, END,
CASE CASE
WHEN "PRICING_ITEMS_1_TYPE" = 'CUS' AND "PRICING_ITEMS_1_UNIT" = 'MIN' THEN "PRICING_ITEMS_1_UNIT_PRICE" WHEN "PRICING_ITEMS_1_TYPE" = 'CUS' AND "PRICING_ITEMS_1_UNIT" = 'MIN' THEN "PRICING_ITEMS_1_UNIT_PRICE"
WHEN "PRICING_ITEMS_2_TYPE" = 'CUS' AND "PRICING_ITEMS_2_UNIT" = 'MIN' THEN "PRICING_ITEMS_2_UNIT_PRICE" WHEN "PRICING_ITEMS_2_TYPE" = 'CUS' AND "PRICING_ITEMS_2_UNIT" = 'MIN' THEN "PRICING_ITEMS_2_UNIT_PRICE"
WHEN "PRICING_ITEMS_3_TYPE" = 'CUS' AND "PRICING_ITEMS_3_UNIT" = 'MIN' THEN "PRICING_ITEMS_3_UNIT_PRICE" WHEN "PRICING_ITEMS_3_TYPE" = 'CUS' AND "PRICING_ITEMS_3_UNIT" = 'MIN' THEN "PRICING_ITEMS_3_UNIT_PRICE"
WHEN "PRICING_ITEMS_4_TYPE" = 'CUS' AND "PRICING_ITEMS_4_UNIT" = 'MIN' THEN "PRICING_ITEMS_4_UNIT_PRICE" WHEN "PRICING_ITEMS_4_TYPE" = 'CUS' AND "PRICING_ITEMS_4_UNIT" = 'MIN' THEN "PRICING_ITEMS_4_UNIT_PRICE"
ELSE NULL ELSE NULL
END, END,
CASE CASE
WHEN "PRICING_ITEMS_1_TYPE" = 'CUS' AND "PRICING_ITEMS_1_UNIT" = 'ST' THEN "PRICING_ITEMS_1_UNIT_PRICE" WHEN "PRICING_ITEMS_1_TYPE" = 'CUS' AND "PRICING_ITEMS_1_UNIT" = 'ST' THEN "PRICING_ITEMS_1_UNIT_PRICE"
WHEN "PRICING_ITEMS_2_TYPE" = 'CUS' AND "PRICING_ITEMS_2_UNIT" = 'ST' THEN "PRICING_ITEMS_2_UNIT_PRICE" WHEN "PRICING_ITEMS_2_TYPE" = 'CUS' AND "PRICING_ITEMS_2_UNIT" = 'ST' THEN "PRICING_ITEMS_2_UNIT_PRICE"
WHEN "PRICING_ITEMS_3_TYPE" = 'CUS' AND "PRICING_ITEMS_3_UNIT" = 'ST' THEN "PRICING_ITEMS_3_UNIT_PRICE" WHEN "PRICING_ITEMS_3_TYPE" = 'CUS' AND "PRICING_ITEMS_3_UNIT" = 'ST' THEN "PRICING_ITEMS_3_UNIT_PRICE"
WHEN "PRICING_ITEMS_4_TYPE" = 'CUS' AND "PRICING_ITEMS_4_UNIT" = 'ST' THEN "PRICING_ITEMS_4_UNIT_PRICE" WHEN "PRICING_ITEMS_4_TYPE" = 'CUS' AND "PRICING_ITEMS_4_UNIT" = 'ST' THEN "PRICING_ITEMS_4_UNIT_PRICE"
ELSE NULL ELSE NULL
END, END,
CASE CASE
WHEN "PRICING_ITEMS_1_TYPE" = 'CUS' AND "PRICING_ITEMS_1_UNIT" = 'MIN' THEN "PRICING_ITEMS_1_QUANTITY" WHEN "PRICING_ITEMS_1_TYPE" = 'CUS' AND "PRICING_ITEMS_1_UNIT" = 'MIN' THEN "PRICING_ITEMS_1_QUANTITY"
WHEN "PRICING_ITEMS_2_TYPE" = 'CUS' AND "PRICING_ITEMS_2_UNIT" = 'MIN' THEN "PRICING_ITEMS_2_QUANTITY" WHEN "PRICING_ITEMS_2_TYPE" = 'CUS' AND "PRICING_ITEMS_2_UNIT" = 'MIN' THEN "PRICING_ITEMS_2_QUANTITY"
WHEN "PRICING_ITEMS_3_TYPE" = 'CUS' AND "PRICING_ITEMS_3_UNIT" = 'MIN' THEN "PRICING_ITEMS_3_QUANTITY" WHEN "PRICING_ITEMS_3_TYPE" = 'CUS' AND "PRICING_ITEMS_3_UNIT" = 'MIN' THEN "PRICING_ITEMS_3_QUANTITY"
WHEN "PRICING_ITEMS_4_TYPE" = 'CUS' AND "PRICING_ITEMS_4_UNIT" = 'MIN' THEN "PRICING_ITEMS_4_QUANTITY" WHEN "PRICING_ITEMS_4_TYPE" = 'CUS' AND "PRICING_ITEMS_4_UNIT" = 'MIN' THEN "PRICING_ITEMS_4_QUANTITY"
ELSE 0 ELSE 0
END, END,
"CHARGE_DATA_EKA_STATUS", "CHARGE_DATA_EKA_STATUS",
0, 0,
@@ -90,8 +90,8 @@ select
'','Y', '','Y',
'EOPERATE', 'EOPERATE',
'V 1.4/28.09.2020' 'V 1.4/28.09.2020'
from "EOPERATE"."CHARGEDATA" from "EOPERATE"."CHARGEDATA"
where where
( (
"PRICING_ITEMS_1_TYPE" = 'CUS' AND ("PRICING_ITEMS_1_QUANTITY" > 2 OR "PRICING_ITEMS_1_UNIT" != 'MIN') "PRICING_ITEMS_1_TYPE" = 'CUS' AND ("PRICING_ITEMS_1_QUANTITY" > 2 OR "PRICING_ITEMS_1_UNIT" != 'MIN')
OR OR
@@ -101,6 +101,6 @@ where
OR OR
"PRICING_ITEMS_4_TYPE" = 'CUS' AND ("PRICING_ITEMS_4_QUANTITY" > 2 OR "PRICING_ITEMS_4_UNIT" != 'MIN') "PRICING_ITEMS_4_TYPE" = 'CUS' AND ("PRICING_ITEMS_4_QUANTITY" > 2 OR "PRICING_ITEMS_4_UNIT" != 'MIN')
) )
and "CHARGE_DATA_CONSUMPTION_KWH" > 0 and "CHARGE_DATA_CONSUMPTION_KWH" > 0
and "SUBSCRIPTION_ID" <> 'SU20200729002' and "SUBSCRIPTION_ID" <> 'SU20200729002'
--and "PLUGTYPE" IS NOT NULL --and "PLUGTYPE" IS NOT NULL
uniorg/eon/eoperate/meta/create_eoperate.sql
+1 -1
View File
@@ -53,7 +53,7 @@ CREATE COLUMN TABLE "EOPERATE"."CHARGEDATA" ("BDR_ID" NVARCHAR(50) NOT NULL,
"JSONRAW" NCLOB MEMORY THRESHOLD 1000, "JSONRAW" NCLOB MEMORY THRESHOLD 1000,
"CREATE_TS" LONGDATE CS_LONGDATE DEFAULT CURRENT_TIMESTAMP NOT NULL , "CREATE_TS" LONGDATE CS_LONGDATE DEFAULT CURRENT_TIMESTAMP NOT NULL ,
"UPDATE_TS" LONGDATE CS_LONGDATE NOT NULL , "UPDATE_TS" LONGDATE CS_LONGDATE NOT NULL ,
PRIMARY KEY ("BDR_ID")) UNLOAD PRIORITY 5 AUTO MERGE; PRIMARY KEY ("BDR_ID")) UNLOAD PRIORITY 5 AUTO MERGE;
/* /*
-- Changes v1.1 -- Changes v1.1
uniorg/eon/eoperate/meta/emobility_view_v15.sql
+14 -14
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",
@@ -59,10 +59,10 @@ ALTER VIEW "EMOBILITY"."V_CHARGEDATA_EMP" ( "ID",
'CPOOPERATORID', 'CPOOPERATORID',
'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",
0, 0,
@@ -74,16 +74,16 @@ END as FREECHARGE,
'DE', 'DE',
'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",
@@ -153,9 +153,9 @@ left("STOPTIME",
"STATUS", "STATUS",
"BILLING", "BILLING",
'VIRTAPORTAL', 'VIRTAPORTAL',
'V 1.6/24.09.2020' 'V 1.6/24.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 * from "EMOBILITY"."V_CHARGEDATA_EMP_EOPERATE" UNION ALL select * from "EMOBILITY"."V_CHARGEDATA_EMP_EOPERATE"
uniorg/eon/eoperate/meta/emobility_view_v16.sql
+21 -21
View File
@@ -62,11 +62,11 @@ CREATE VIEW "EMOBILITY"."V_CHARGEDATA_EMP" ( "ID",
CPOOPERATORID, CPOOPERATORID,
'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,
@@ -77,17 +77,17 @@ CREATE VIEW "EMOBILITY"."V_CHARGEDATA_EMP" ( "ID",
'DE', 'DE',
'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),
@@ -157,12 +157,12 @@ CREATE VIEW "EMOBILITY"."V_CHARGEDATA_EMP" ( "ID",
"STATUS", "STATUS",
"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" ,
@@ -212,5 +212,5 @@ CREATE VIEW "EMOBILITY"."V_CHARGEDATA_EMP" ( "ID",
"STATUS" , "STATUS" ,
"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
+26 -26
View File
@@ -61,16 +61,16 @@ ALTER VIEW "EMOBILITY"."V_CHARGEDATA_EMP" ( "ID",
CPOOPERATORID, CPOOPERATORID,
'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",
@@ -80,17 +80,17 @@ ALTER VIEW "EMOBILITY"."V_CHARGEDATA_EMP" ( "ID",
'DE', 'DE',
'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),
@@ -160,12 +160,12 @@ ALTER VIEW "EMOBILITY"."V_CHARGEDATA_EMP" ( "ID",
"STATUS", "STATUS",
"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" ,
@@ -215,5 +215,5 @@ ALTER VIEW "EMOBILITY"."V_CHARGEDATA_EMP" ( "ID",
"STATUS" , "STATUS" ,
"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
+8 -5
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();
@@ -459,7 +462,7 @@ function PutDataInTable() {
} else { } else {
pstmt.setNull(50); pstmt.setNull(50);
} }
if (isUpdateMode) { if (isUpdateMode) {
pstmt.setNString(51, myBDRID); pstmt.setNString(51, myBDRID);