Weiterarbeit Users, Server implementier für Config-Data austausch, Data funktioniert noch nicht korrekt
This commit is contained in:
@@ -8,9 +8,10 @@ import time
|
||||
import datetime
|
||||
import json
|
||||
import main
|
||||
import serverrequests
|
||||
# Gehe in eine Dauerschlaufe
|
||||
|
||||
ID = "SRING_TO_DEFINE"
|
||||
ID = "BasToken"
|
||||
|
||||
producer_values = []
|
||||
producers =[]
|
||||
@@ -23,16 +24,15 @@ users = []
|
||||
|
||||
Collector = JsonHandling.DataCollector()
|
||||
data = {}
|
||||
|
||||
def calcSomeStuff():
|
||||
return
|
||||
|
||||
|
||||
|
||||
while True:
|
||||
|
||||
# Neue Konfig holen
|
||||
config = serverrequests.update_config_on_server(ID, data)
|
||||
config = json.dumps(serverrequests.get_config(ID))
|
||||
|
||||
if JsonHandling.JsonHandling.check_config_has_changed(config):
|
||||
producers = energyproducer.EnergyProducer.create_producerlist_from_json(config)
|
||||
meter = energymeter.EnergyMeter.create_meterlist_from_json(config)
|
||||
@@ -45,10 +45,13 @@ while True:
|
||||
for user in users:
|
||||
user.calc_used_power()
|
||||
|
||||
main.EnergyUserFactory.distribute_energy(users, meter_values["Meter_Sum"]["PowerReal_P_Sum"])
|
||||
main.EnergyUserFactory.distribute_energy(users, -1*(meter_values["Meter_Sum"]["PowerReal_P_Sum"]))
|
||||
|
||||
user_values = energyuser.EnergyUser.get_all_current_values(users)
|
||||
|
||||
Collector.collect_and_store_data(producer_values, meter_values, user_values)
|
||||
data = Collector.data
|
||||
serverrequests.set_data(ID, data)
|
||||
|
||||
|
||||
time.sleep(5)
|
||||
Reference in New Issue
Block a user