smarthut/backend
2
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

Merge branch 'thermostat-fix' into 'dev'

Browse source 
Thermostats fixed

See merge request sa4-2020/the-sanmarinoes/backend!105
This commit is contained in:
Claudio Maggioni 2020-05-02 11:16:39 +02:00
commit 36dbb0dac9
3 changed files with 17 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
src/main/java/ch/usi/inf/sa4/sanmarinoes/smarthut/controller/ThermostatController.java
View file

@ -28,11 +28,14 @@ public class ThermostatController {
newT.setId(t.getId());
newT.setName(t.getName());
newT.setRoomId(t.getRoomId());
newT.setMeasuredTemperature(t.getMeasuredTemperature());
newT.setUseExternalSensors(t.isUseExternalSensors());
newT.setOn(t.isTurnOn());
newT.setOn(false);
System.out.println(newT);
thermostatService.populateMeasuredTemperature(newT);
newT = thermostatRepository.save(newT);
newT.setOn(t.isTurnOn());
newT = deviceService.saveAsOwner(newT, principal.getName());
return newT;
}

10
src/main/java/ch/usi/inf/sa4/sanmarinoes/smarthut/dto/ThermostatSaveRequest.java
View file

@ -22,8 +22,6 @@ public class ThermostatSaveRequest {
@NotNull private boolean useExternalSensors;
@NotNull private BigDecimal measuredTemperature;
/** State of this thermostat */
@NotNull private boolean turnOn;
@ -74,12 +72,4 @@ public class ThermostatSaveRequest {
public void setId(long id) {
this.id = id;
}
public BigDecimal getMeasuredTemperature() {
return measuredTemperature;
}
public void setMeasuredTemperature(BigDecimal measuredTemperature) {
this.measuredTemperature = measuredTemperature;
}
}

12
src/main/java/ch/usi/inf/sa4/sanmarinoes/smarthut/models/Thermostat.java
View file

@ -87,6 +87,18 @@ public class Thermostat extends Switchable implements BooleanTriggerable {
this.mode = Mode.OFF;
}
@Override
public String toString() {
final StringBuilder sb = new StringBuilder("Thermostat{");
sb.append("targetTemperature=").append(targetTemperature);
sb.append(", internalSensorTemperature=").append(internalSensorTemperature);
sb.append(", mode=").append(mode);
sb.append(", measuredTemperature=").append(measuredTemperature);
sb.append(", useExternalSensors=").append(useExternalSensors);
sb.append('}');
return sb.toString();
}
public void setMode(Mode state) {
this.mode = state;
}