public
/
openhab-addons
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

[fronius] fix invalid json error on meter data (#9912) 

Signed-off-by: Jimmy Tanagra <jcode@tanagra.id.au>
This commit is contained in:
jimtng 2021-01-25 06:05:15 +10:00 committed by GitHub
parent 506d21face
commit 4fba096057
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 22 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

42
bundles/org.openhab.binding.fronius/src/main/java/org/openhab/binding/fronius/internal/api/MeterRealtimeBodyDataDTO.java
View File

@ -32,17 +32,17 @@ public class MeterRealtimeBodyDataDTO {
@SerializedName("Enable") @SerializedName("Enable")
private int enable; private int enable;
@SerializedName("EnergyReactive_VArAC_Sum_Consumed") @SerializedName("EnergyReactive_VArAC_Sum_Consumed")
private int energyReactiveVArACSumConsumed; private double energyReactiveVArACSumConsumed;
@SerializedName("EnergyReactive_VArAC_Sum_Produced") @SerializedName("EnergyReactive_VArAC_Sum_Produced")
private int energyReactiveVArACSumProduced; private double energyReactiveVArACSumProduced;
@SerializedName("EnergyReal_WAC_Minus_Absolute") @SerializedName("EnergyReal_WAC_Minus_Absolute")
private int energyRealWACMinusAbsolute; private double energyRealWACMinusAbsolute;
@SerializedName("EnergyReal_WAC_Plus_Absolute") @SerializedName("EnergyReal_WAC_Plus_Absolute")
private int energyRealWACPlusAbsolute; private double energyRealWACPlusAbsolute;
@SerializedName("EnergyReal_WAC_Sum_Consumed") @SerializedName("EnergyReal_WAC_Sum_Consumed")
private int energyRealWACSumConsumed; private double energyRealWACSumConsumed;
@SerializedName("EnergyReal_WAC_Sum_Produced") @SerializedName("EnergyReal_WAC_Sum_Produced")
private int energyRealWACSumProduced; private double energyRealWACSumProduced;
@SerializedName("Frequency_Phase_Average") @SerializedName("Frequency_Phase_Average")
private double frequencyPhaseAverage; private double frequencyPhaseAverage;
@SerializedName("Meter_Location_Current") @SerializedName("Meter_Location_Current")
@ -54,7 +54,7 @@ public class MeterRealtimeBodyDataDTO {
@SerializedName("PowerApparent_S_Phase_3") @SerializedName("PowerApparent_S_Phase_3")
private double powerApparentSPhase3; private double powerApparentSPhase3;
@SerializedName("PowerApparent_S_Sum") @SerializedName("PowerApparent_S_Sum")
private int powerApparentSSum; private double powerApparentSSum;
@SerializedName("PowerFactor_Phase_1") @SerializedName("PowerFactor_Phase_1")
private double powerFactorPhase1; private double powerFactorPhase1;
@SerializedName("PowerFactor_Phase_2") @SerializedName("PowerFactor_Phase_2")
@ -139,51 +139,51 @@ public class MeterRealtimeBodyDataDTO {
this.enable = enable; this.enable = enable;
} }
public int getEnergyReactiveVArACSumConsumed() { public double getEnergyReactiveVArACSumConsumed() {
return energyReactiveVArACSumConsumed; return energyReactiveVArACSumConsumed;
} }
public void setEnergyReactiveVArACSumConsumed(int energyReactiveVArACSumConsumed) { public void setEnergyReactiveVArACSumConsumed(double energyReactiveVArACSumConsumed) {
this.energyReactiveVArACSumConsumed = energyReactiveVArACSumConsumed; this.energyReactiveVArACSumConsumed = energyReactiveVArACSumConsumed;
} }
public int getEnergyReactiveVArACSumProduced() { public double getEnergyReactiveVArACSumProduced() {
return energyReactiveVArACSumProduced; return energyReactiveVArACSumProduced;
} }
public void setEnergyReactiveVArACSumProduced(int energyReactiveVArACSumProduced) { public void setEnergyReactiveVArACSumProduced(double energyReactiveVArACSumProduced) {
this.energyReactiveVArACSumProduced = energyReactiveVArACSumProduced; this.energyReactiveVArACSumProduced = energyReactiveVArACSumProduced;
} }
public int getEnergyRealWACMinusAbsolute() { public double getEnergyRealWACMinusAbsolute() {
return energyRealWACMinusAbsolute; return energyRealWACMinusAbsolute;
} }
public void setEnergyRealWACMinusAbsolute(int energyRealWACMinusAbsolute) { public void setEnergyRealWACMinusAbsolute(double energyRealWACMinusAbsolute) {
this.energyRealWACMinusAbsolute = energyRealWACMinusAbsolute; this.energyRealWACMinusAbsolute = energyRealWACMinusAbsolute;
} }
public int getEnergyRealWACPlusAbsolute() { public double getEnergyRealWACPlusAbsolute() {
return energyRealWACPlusAbsolute; return energyRealWACPlusAbsolute;
} }
public void setEnergyRealWACPlusAbsolute(int energyRealWACPlusAbsolute) { public void setEnergyRealWACPlusAbsolute(double energyRealWACPlusAbsolute) {
this.energyRealWACPlusAbsolute = energyRealWACPlusAbsolute; this.energyRealWACPlusAbsolute = energyRealWACPlusAbsolute;
} }
public int getEnergyRealWACSumConsumed() { public double getEnergyRealWACSumConsumed() {
return energyRealWACSumConsumed; return energyRealWACSumConsumed;
} }
public void setEnergyRealWACSumConsumed(int energyRealWACSumConsumed) { public void setEnergyRealWACSumConsumed(double energyRealWACSumConsumed) {
this.energyRealWACSumConsumed = energyRealWACSumConsumed; this.energyRealWACSumConsumed = energyRealWACSumConsumed;
} }
public int getEnergyRealWACSumProduced() { public double getEnergyRealWACSumProduced() {
return energyRealWACSumProduced; return energyRealWACSumProduced;
} }
public void setEnergyRealWACSumProduced(int energyRealWACSumProduced) { public void setEnergyRealWACSumProduced(double energyRealWACSumProduced) {
this.energyRealWACSumProduced = energyRealWACSumProduced; this.energyRealWACSumProduced = energyRealWACSumProduced;
} }
@ -227,11 +227,11 @@ public class MeterRealtimeBodyDataDTO {
this.powerApparentSPhase3 = powerApparentSPhase3; this.powerApparentSPhase3 = powerApparentSPhase3;
} }
public int getPowerApparentSSum() { public double getPowerApparentSSum() {
return powerApparentSSum; return powerApparentSSum;
} }
public void setPowerApparentSSum(int powerApparentSSum) { public void setPowerApparentSSum(double powerApparentSSum) {
this.powerApparentSSum = powerApparentSSum; this.powerApparentSSum = powerApparentSSum;
} }

2
bundles/org.openhab.binding.fronius/src/main/java/org/openhab/binding/fronius/internal/handler/FroniusBaseThingHandler.java
View File

@ -200,7 +200,7 @@ public abstract class FroniusBaseThingHandler extends BaseThingHandler {
} }
} catch (JsonSyntaxException e) { } catch (JsonSyntaxException e) {
errorMsg = "Invalid JSON data received"; errorMsg = "Invalid JSON data received";
logger.debug("Error running fronius request: {}", errorMsg); logger.debug("Error running fronius request: {}", e.getMessage());
} catch (IOException | IllegalStateException e) { } catch (IOException | IllegalStateException e) {
errorMsg = e.getMessage(); errorMsg = e.getMessage();
logger.debug("Error running fronius request: {}", errorMsg); logger.debug("Error running fronius request: {}", errorMsg);