|
@@ -184,6 +184,8 @@ public class TEquipmentController {
|
|
equipmentDTO.setStick(equipmentDesc.getStick());
|
|
equipmentDTO.setStick(equipmentDesc.getStick());
|
|
equipmentDTO.setWhiteSugar(equipmentDesc.getWhiteSugar());
|
|
equipmentDTO.setWhiteSugar(equipmentDesc.getWhiteSugar());
|
|
equipmentDTO.setSleepDesc(equipmentDesc.getSleepDesc());
|
|
equipmentDTO.setSleepDesc(equipmentDesc.getSleepDesc());
|
|
|
|
+ equipmentDTO.setOutDoor(equipmentDesc.getOutDoor());
|
|
|
|
+ equipmentDTO.setInDoor(equipmentDesc.getInDoor());
|
|
}
|
|
}
|
|
|
|
|
|
}
|
|
}
|
|
@@ -413,7 +415,7 @@ public class TEquipmentController {
|
|
message[1]=equipment.getMessageReceiver2();
|
|
message[1]=equipment.getMessageReceiver2();
|
|
message[2]=equipment.getMessageReceiver3();
|
|
message[2]=equipment.getMessageReceiver3();
|
|
if(message.length>0){
|
|
if(message.length>0){
|
|
- oldEquipment.setMessageReceiver(message.toString());
|
|
|
|
|
|
+ oldEquipment.setMessageReceiver(message[0] + "," + message[1] + "," + message[2]);
|
|
}
|
|
}
|
|
tEquipmentService.updateById(oldEquipment);
|
|
tEquipmentService.updateById(oldEquipment);
|
|
String channel = oldEquipment.getChannel();
|
|
String channel = oldEquipment.getChannel();
|