diff --git a/uniorg/eon/eoperate/meta/2023-04-21_V_CHARGEDATA.sql b/uniorg/eon/eoperate/meta/2023-04-21_V_CHARGEDATA.sql index 4a3c488..20f0b44 100644 --- a/uniorg/eon/eoperate/meta/2023-04-21_V_CHARGEDATA.sql +++ b/uniorg/eon/eoperate/meta/2023-04-21_V_CHARGEDATA.sql @@ -54,35 +54,35 @@ CREATE VIEW "EOPERATE"."V_CHARGEDATA" ( "CHECK_CONSUMED_WATTHOUR", "UPDATE_TS", "CREATE_USER", "UPDATE_USER" ) AS WITH "EVDRV" AS (select - distinct U_EOPERATE_ID - from "A19753_EON_P01"."@EON_CONTRACT_EVDRV" + distinct U_EOPERATE_ID + from "A19753_EON_P01"."@EON_CONTRACT_EVDRV" where U_EOPERATE_ID <> '') SELECT - CASE WHEN CHARGE_DATA_CONSUMPTION_KWH > 120 -OR CHARGE_DATA_CONSUMPTION_KWH = 0 -THEN 'INVALID' -ELSE 'OK' + CASE WHEN CHARGE_DATA_CONSUMPTION_KWH > 120 +OR CHARGE_DATA_CONSUMPTION_KWH = 0 +THEN 'INVALID' +ELSE 'OK' END as "CHECK_CONSUMED_WATTHOUR", - CASE WHEN CHARGE_DATA_BEGIN_UTC IS NULL -THEN 'NULL' WHEN CHARGE_DATA_BEGIN_UTC = CHARGE_DATA_END_UTC -THEN 'EQUAL' WHEN CHARGE_DATA_END_UTC < CHARGE_DATA_BEGIN_UTC -THEN 'INVALID' -ELSE 'OK' + CASE WHEN CHARGE_DATA_BEGIN_UTC IS NULL +THEN 'NULL' WHEN CHARGE_DATA_BEGIN_UTC = CHARGE_DATA_END_UTC +THEN 'EQUAL' WHEN CHARGE_DATA_END_UTC < CHARGE_DATA_BEGIN_UTC +THEN 'INVALID' +ELSE 'OK' END AS "CHECK_START_STOP", 'OK' AS "CHECK_DURATION", - CASE WHEN EVDRV.U_EOPERATE_ID IS NULL -THEN 'NO CONTRACT' -ELSE 'OK' + CASE WHEN EVDRV.U_EOPERATE_ID IS NULL +THEN 'NO CONTRACT' +ELSE 'OK' END as "CHECK_CONTRACT_EXISTS", (SELECT - LAST_VALUE(STATUS - order by ID) - FROM "A19753_EON_P01"."EON_CHARGEDATA" CD - WHERE CD.NICE_CDRID = ET.UNIQUE_ID + LAST_VALUE(STATUS + 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, (SELECT - MAX(ID ) - FROM "A19753_EON_P01"."EON_CHARGEDATA" CD - WHERE CD.NICE_CDRID = ET.UNIQUE_ID + MAX(ID ) + FROM "A19753_EON_P01"."EON_CHARGEDATA" CD + WHERE CD.NICE_CDRID = ET.UNIQUE_ID AND CD.BILLING_MODE = 'EMP' ) as BILLING_ID, "BDR_ID", "EMAID", @@ -133,6 +133,6 @@ END as "CHECK_CONTRACT_EXISTS", "CREATE_TS", "UPDATE_TS", "CREATE_USER", - "UPDATE_USER" -from "EOPERATE"."CHARGEDATA" ET + "UPDATE_USER" +from "EOPERATE"."CHARGEDATA" ET LEFT OUTER join EVDRV on ET."EMAID" = EVDRV.U_EOPERATE_ID WITH READ ONLY \ No newline at end of file diff --git a/uniorg/eon/eoperate/meta/2023-04-21_V_CHARGEDATA_DUPLICATES.sql b/uniorg/eon/eoperate/meta/2023-04-21_V_CHARGEDATA_DUPLICATES.sql index 3c993d0..760d01c 100644 --- a/uniorg/eon/eoperate/meta/2023-04-21_V_CHARGEDATA_DUPLICATES.sql +++ b/uniorg/eon/eoperate/meta/2023-04-21_V_CHARGEDATA_DUPLICATES.sql @@ -19,19 +19,19 @@ CREATE VIEW "EOPERATE"."V_CHARGEDATA_DUPLICATES" ( "UNIQUE_ID", IFNULL(CHECK_BILLING, 'Z') AS CHECK_BILLING, CREATE_TS, - UPDATE_TS - FROM "EOPERATE"."V_CHARGEDATA" AS V - WHERE CHECK_CONTRACT_EXISTS = 'OK' --AND CHECK_CONSUMED_WATTHOUR = 'OK' - --AND CHECK_START_STOP = 'OK' - - AND CHECK_DURATION = 'OK' + UPDATE_TS + FROM "EOPERATE"."V_CHARGEDATA" AS V + WHERE CHECK_CONTRACT_EXISTS = 'OK' --AND CHECK_CONSUMED_WATTHOUR = 'OK' + --AND CHECK_START_STOP = 'OK' + + AND CHECK_DURATION = 'OK' AND UPDATE_TS > '20220101'), "HAVING_DUPLICATES" AS (SELECT EMAID, CHARGEPOINT_ID, CHARGE_DATA_BEGIN_UTC, - COUNT(*) AS DUPLICATES - FROM VALID + COUNT(*) AS DUPLICATES + FROM VALID GROUP BY EMAID, CHARGEPOINT_ID, CHARGE_DATA_BEGIN_UTC HAVING COUNT(*) > 1), @@ -49,17 +49,17 @@ CREATE VIEW "EOPERATE"."V_CHARGEDATA_DUPLICATES" ( "UNIQUE_ID", "V"."UPDATE_TS" , RANK() OVER ( PARTITION BY EMAID, CHARGEPOINT_ID, - CHARGE_DATA_BEGIN_UTC - ORDER BY CHECK_BILLING, + CHARGE_DATA_BEGIN_UTC + ORDER BY CHECK_BILLING, CHARGE_DATA_CONSUMPTION_KWH DESC, - BDR_ID DESC ) AS Rank - FROM "VALID" V + 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 + 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 "D"."UNIQUE_ID" , "D"."BDR_ID" , "D"."EMAID" , @@ -71,9 +71,9 @@ CREATE VIEW "EOPERATE"."V_CHARGEDATA_DUPLICATES" ( "UNIQUE_ID", 'Z') AS CHECK_BILLING, "D"."CREATE_TS" , "D"."UPDATE_TS" , - "D"."RANK" -FROM "DUPLICATE_WITH_RANK" D -WHERE UPDATE_TS > '20230101' + "D"."RANK" +FROM "DUPLICATE_WITH_RANK" D +WHERE UPDATE_TS > '20230101' ORDER BY D.CHARGE_DATA_BEGIN_UTC DESC , D.CHARGEPOINT_ID, D.RANK WITH READ ONLY \ No newline at end of file diff --git a/uniorg/eon/eoperate/meta/create_emobilityview_eoperate.sql b/uniorg/eon/eoperate/meta/create_emobilityview_eoperate.sql index 5e359fa..5331a48 100644 --- a/uniorg/eon/eoperate/meta/create_emobilityview_eoperate.sql +++ b/uniorg/eon/eoperate/meta/create_emobilityview_eoperate.sql @@ -1,9 +1,9 @@ -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", -"PROVIDERNAME", "CHARGINGSTARTTIME", "CHARGINGSTOPTIME", "PARKINGSTARTTIME", "PARKINGSTOPTIME", "METERSTART", "METERSTOP", "TARIFF", "CURRENCY", "VAT", -"BILLINGVALUEBRUTTO", "BILLINGVALUENETTO", "PARKINGTIMEPRICEBRUTTO", "PARKINGTIMEPRICENETTO", "ADITIONALPRICEBRUTTO", "ADITIONALPRICENETTO", "KWHNETPRICE", +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", +"PROVIDERNAME", "CHARGINGSTARTTIME", "CHARGINGSTOPTIME", "PARKINGSTARTTIME", "PARKINGSTOPTIME", "METERSTART", "METERSTOP", "TARIFF", "CURRENCY", "VAT", +"BILLINGVALUEBRUTTO", "BILLINGVALUENETTO", "PARKINGTIMEPRICEBRUTTO", "PARKINGTIMEPRICENETTO", "ADITIONALPRICEBRUTTO", "ADITIONALPRICENETTO", "KWHNETPRICE", "MINUTENETPRICE", "SESSIONNETPRICE", "DURATION", "EICHRECHTTYPE", "MILEAGE", "SUBSCRIPTION_ID", "CREATE_TS", "UPDATE_TS", "STATUS", "BILLING", "SYSTYPE", "VIEWVERSION" - ) AS + ) AS select 'EOP' || "BDR_ID", "BDR_ID", @@ -34,53 +34,53 @@ select 0, 0, 'TARIFF', - CASE - 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_3_TYPE" = 'CUS' THEN "PRICING_ITEMS_3_CURRENCY" - WHEN "PRICING_ITEMS_4_TYPE" = 'CUS' THEN "PRICING_ITEMS_4_CURRENCY" - ELSE NULL + CASE + 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_3_TYPE" = 'CUS' THEN "PRICING_ITEMS_3_CURRENCY" + WHEN "PRICING_ITEMS_4_TYPE" = 'CUS' THEN "PRICING_ITEMS_4_CURRENCY" + ELSE NULL END, 0, 0, - CASE - 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_3_TYPE" = 'CUS' THEN "PRICING_ITEMS_3_NET_AMOUNT" - WHEN "PRICING_ITEMS_4_TYPE" = 'CUS' THEN "PRICING_ITEMS_4_NET_AMOUNT" - ELSE NULL + CASE + 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_3_TYPE" = 'CUS' THEN "PRICING_ITEMS_3_NET_AMOUNT" + WHEN "PRICING_ITEMS_4_TYPE" = 'CUS' THEN "PRICING_ITEMS_4_NET_AMOUNT" + ELSE NULL END, 0, 0, 0, 0, - CASE - 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_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" - ELSE NULL + CASE + 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_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" + ELSE NULL END, - CASE - 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_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" - ELSE NULL + CASE + 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_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" + ELSE NULL END, - CASE - 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_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" - ELSE NULL + CASE + 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_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" + ELSE NULL END, - CASE - 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_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" - ELSE 0 + CASE + 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_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" + ELSE 0 END, "CHARGE_DATA_EKA_STATUS", 0, @@ -90,8 +90,8 @@ select '','Y', 'EOPERATE', 'V 1.4/28.09.2020' -from "EOPERATE"."CHARGEDATA" -where +from "EOPERATE"."CHARGEDATA" +where ( "PRICING_ITEMS_1_TYPE" = 'CUS' AND ("PRICING_ITEMS_1_QUANTITY" > 2 OR "PRICING_ITEMS_1_UNIT" != 'MIN') OR @@ -101,6 +101,6 @@ where OR "PRICING_ITEMS_4_TYPE" = 'CUS' AND ("PRICING_ITEMS_4_QUANTITY" > 2 OR "PRICING_ITEMS_4_UNIT" != 'MIN') ) -and "CHARGE_DATA_CONSUMPTION_KWH" > 0 -and "SUBSCRIPTION_ID" <> 'SU20200729002' +and "CHARGE_DATA_CONSUMPTION_KWH" > 0 +and "SUBSCRIPTION_ID" <> 'SU20200729002' --and "PLUGTYPE" IS NOT NULL \ No newline at end of file diff --git a/uniorg/eon/eoperate/meta/create_eoperate.sql b/uniorg/eon/eoperate/meta/create_eoperate.sql index 3a909ac..b8a0272 100644 --- a/uniorg/eon/eoperate/meta/create_eoperate.sql +++ b/uniorg/eon/eoperate/meta/create_eoperate.sql @@ -53,7 +53,7 @@ CREATE COLUMN TABLE "EOPERATE"."CHARGEDATA" ("BDR_ID" NVARCHAR(50) NOT NULL, "JSONRAW" NCLOB MEMORY THRESHOLD 1000, "CREATE_TS" LONGDATE CS_LONGDATE DEFAULT CURRENT_TIMESTAMP 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 diff --git a/uniorg/eon/eoperate/meta/emobility_view_v15.sql b/uniorg/eon/eoperate/meta/emobility_view_v15.sql index 532cdc2..c6211e8 100644 --- a/uniorg/eon/eoperate/meta/emobility_view_v15.sql +++ b/uniorg/eon/eoperate/meta/emobility_view_v15.sql @@ -12,7 +12,7 @@ ALTER VIEW "EMOBILITY"."V_CHARGEDATA_EMP" ( "ID", "OPERATORSUBMANDANT", "FREECHARGE", "CHARGEPOINTTYPE", - " METERID", + "METERID", "MAXSOCKETPOWER", "ADDRESS", "ZIP", @@ -59,10 +59,10 @@ ALTER VIEW "EMOBILITY"."V_CHARGEDATA_EMP" ( "ID", 'CPOOPERATORID', 'OPERATORNAME', 'true', - CASE "FREECHARGING" WHEN 'yes' -THEN 'true' WHEN 'no' -then 'false' -ELSE '' + CASE "FREECHARGING" WHEN 'yes' +THEN 'true' WHEN 'no' +then 'false' +ELSE '' END as FREECHARGE, "PLUGTYPE", 0, @@ -74,16 +74,16 @@ END as FREECHARGE, 'DE', 'PROVIDERID', 'PROVIDERNAME', - + left("STARTTIME", 19), - + left("STOPTIME", 19), - + left("STARTTIME", 19), - + left("STOPTIME", 19), IFNULL( "METERSTART", @@ -153,9 +153,9 @@ left("STOPTIME", "STATUS", "BILLING", 'VIRTAPORTAL', - 'V 1.6/24.09.2020' -from "VIRTAPORTAL"."EMP_TRANSACTIONS" -where "TRANSACTIONTYPE" = 'charge' -and "WATTHOUR" > 0 + 'V 1.6/24.09.2020' +from "VIRTAPORTAL"."EMP_TRANSACTIONS" +where "TRANSACTIONTYPE" = 'charge' +and "WATTHOUR" > 0 and "DURATION" > 2 -UNION ALL select * from "EMOBILITY"."V_CHARGEDATA_EMP_EOPERATE" \ No newline at end of file +UNION ALL select * from "EMOBILITY"."V_CHARGEDATA_EMP_EOPERATE" \ No newline at end of file diff --git a/uniorg/eon/eoperate/meta/emobility_view_v16.sql b/uniorg/eon/eoperate/meta/emobility_view_v16.sql index ced77ef..7a3530f 100644 --- a/uniorg/eon/eoperate/meta/emobility_view_v16.sql +++ b/uniorg/eon/eoperate/meta/emobility_view_v16.sql @@ -62,11 +62,11 @@ CREATE VIEW "EMOBILITY"."V_CHARGEDATA_EMP" ( "ID", CPOOPERATORID, 'OPERATORNAME', 'true', - CASE "FREECHARGING" WHEN 'yes' - THEN 'true' WHEN 'no' - then 'false' - ELSE '' - END as FREECHARGE, + CASE "FREECHARGING" WHEN 'yes' + THEN 'true' WHEN 'no' + then 'false' + ELSE '' + END as FREECHARGE, "PLUGTYPE", 'METERID', 0, @@ -77,17 +77,17 @@ CREATE VIEW "EMOBILITY"."V_CHARGEDATA_EMP" ( "ID", 'DE', '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), @@ -157,12 +157,12 @@ CREATE VIEW "EMOBILITY"."V_CHARGEDATA_EMP" ( "ID", "STATUS", "BILLING", 'VIRTAPORTAL', - 'V 1.6/25.09.2020' - from "VIRTAPORTAL"."EMP_TRANSACTIONS" - where "TRANSACTIONTYPE" = 'charge' - and "WATTHOUR" > 0 - and "DURATION" > 2) - UNION ALL (SELECT + 'V 1.6/25.09.2020' + from "VIRTAPORTAL"."EMP_TRANSACTIONS" + where "TRANSACTIONTYPE" = 'charge' + and "WATTHOUR" > 0 + and "DURATION" > 2) + UNION ALL (SELECT "ID" , "CALLID" , "CDRID" , @@ -212,5 +212,5 @@ CREATE VIEW "EMOBILITY"."V_CHARGEDATA_EMP" ( "ID", "STATUS" , "BILLING" , "SYSTYPE" , - "VIEWVERSION" - from "EMOBILITY"."V_CHARGEDATA_EMP_EOPERATE")) WITH READ ONLY \ No newline at end of file + "VIEWVERSION" + from "EMOBILITY"."V_CHARGEDATA_EMP_EOPERATE")) WITH READ ONLY \ No newline at end of file diff --git a/uniorg/eon/eoperate/meta/emobility_view_v18.sql b/uniorg/eon/eoperate/meta/emobility_view_v18.sql index cc9ea7e..18e7fee 100644 --- a/uniorg/eon/eoperate/meta/emobility_view_v18.sql +++ b/uniorg/eon/eoperate/meta/emobility_view_v18.sql @@ -61,16 +61,16 @@ ALTER VIEW "EMOBILITY"."V_CHARGEDATA_EMP" ( "ID", CPOOPERATORID, '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", + 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", 'METERID', 0, "LOCATION_ADDRESS", @@ -80,17 +80,17 @@ ALTER VIEW "EMOBILITY"."V_CHARGEDATA_EMP" ( "ID", 'DE', '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), @@ -160,12 +160,12 @@ ALTER VIEW "EMOBILITY"."V_CHARGEDATA_EMP" ( "ID", "STATUS", "BILLING", 'VIRTAPORTAL', - 'V 1.8/23.10.2020' - from "VIRTAPORTAL"."EMP_TRANSACTIONS" - where "TRANSACTIONTYPE" = 'charge' - and "WATTHOUR" > 0 - and "DURATION" > 2) - UNION ALL (SELECT + 'V 1.8/23.10.2020' + from "VIRTAPORTAL"."EMP_TRANSACTIONS" + where "TRANSACTIONTYPE" = 'charge' + and "WATTHOUR" > 0 + and "DURATION" > 2) + UNION ALL (SELECT "ID" , "CALLID" , "CDRID" , @@ -215,5 +215,5 @@ ALTER VIEW "EMOBILITY"."V_CHARGEDATA_EMP" ( "ID", "STATUS" , "BILLING" , "SYSTYPE" , - "VIEWVERSION" - from "EMOBILITY"."V_CHARGEDATA_EMP_EOPERATE")) WITH READ ONLY \ No newline at end of file + "VIEWVERSION" + from "EMOBILITY"."V_CHARGEDATA_EMP_EOPERATE")) WITH READ ONLY \ No newline at end of file diff --git a/uniorg/eon/eoperate/v1/setchargedata.xsjs b/uniorg/eon/eoperate/v1/setchargedata.xsjs index 6b1efeb..e459c63 100644 --- a/uniorg/eon/eoperate/v1/setchargedata.xsjs +++ b/uniorg/eon/eoperate/v1/setchargedata.xsjs @@ -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(); @@ -459,7 +462,7 @@ function PutDataInTable() { } else { pstmt.setNull(50); } - + if (isUpdateMode) { pstmt.setNString(51, myBDRID);