Commit 20a1acad authored by ZZH's avatar ZZH

fix anshiu 2023-7-31

parent f21859b9
...@@ -128,7 +128,9 @@ async def get_aiao_1min_pds(slots, temp_res_data, res_curr_th): ...@@ -128,7 +128,9 @@ async def get_aiao_1min_pds(slots, temp_res_data, res_curr_th):
async def get_aiao_data_pds(slots, temp_res_data, res_curr_th): async def get_aiao_data_pds(slots, temp_res_data, res_curr_th):
temp, res, s_value, a_value, b_value, c_value, n_value = [], [], { temp, res, s_value, a_value, b_value, c_value, n_value = [], [], {
"item": "漏电流", "threhold": res_curr_th}, {"item": "A相"}, { "item": "漏电流", "threhold": res_curr_th}, {"item": "A相"}, {
"item": "B相"}, {"item": "C相"}, {"item": "N线"} "item": "B相"}, {
"item": "C相"}, {
"item": "N线"}
temp1, temp2, temp3, temp4, res_curr = {}, {}, {}, {}, {} temp1, temp2, temp3, temp4, res_curr = {}, {}, {}, {}, {}
for i in temp_res_data: for i in temp_res_data:
...@@ -164,181 +166,79 @@ async def get_aiao_data_pds(slots, temp_res_data, res_curr_th): ...@@ -164,181 +166,79 @@ async def get_aiao_data_pds(slots, temp_res_data, res_curr_th):
async def get_point_1min_chart_pds(ctnum, slots, data): async def get_point_1min_chart_pds(ctnum, slots, data):
if ctnum == 3: if ctnum == 3:
i, v, power, ia_value, ib_value, ic_value, ua_value, ub_value, uc_value, pttl_value, qttl_value \ fields = ["ia", "ib", "ic", "ua", "ub", "uc", "pttl", "qttl"]
= [], [], [], {"item": "ia"}, {"item": "ib"}, {"item": "ic"}, { else:
"item": "ua"}, {"item": "ub"}, {"item": "uc"}, {"item": "pttl"}, { fields = ["ia", "ic", "uab", "ucb", "pttl", "qttl"]
"item": "qttl"}
d_parse = {field: {} for field in fields}
ia_dict, ib_dict, ic_dict, pttl_dict, qttl_dict, ua_dict, ub_dict, uc_dict \ for d_item in data:
= {}, {}, {}, {}, {}, {}, {}, {} for field in fields:
[ia_dict.update({i.get("ts"): i.get("ia")}) for i in data] d_parse[field][d_item.get("ts")] = d_item.get(field)
[ib_dict.update({i.get("ts"): i.get("ib")}) for i in data]
[ic_dict.update({i.get("ts"): i.get("ic")}) for i in data] d_stats = {field: [] for field in fields}
[pttl_dict.update({i.get("ts"): i.get("pttl")}) for i in data] for field in fields:
[qttl_dict.update({i.get("ts"): i.get("qttl")}) for i in data] d_stats[field] = [d_parse[field].get(s, "") for s in slots]
[ua_dict.update({i.get("ts"): i.get("ua")}) for i in data]
[ub_dict.update({i.get("ts"): i.get("ub")}) for i in data] if ctnum == 3:
[uc_dict.update({i.get("ts"): i.get("uc")}) for i in data] d_ia = dict(item="ia", value_slots=d_stats["ia"])
d_ib = dict(item="ib", value_slots=d_stats["ib"])
ia_list, ib_list, ic_list, pttl_list, qttl_list, ua_list, ub_list, uc_list \ d_ic = dict(item="ic", value_slots=d_stats["ic"])
= [], [], [], [], [], [], [], [] d_ua = dict(item="ua", value_slots=d_stats["ua"])
d_ub = dict(item="ub", value_slots=d_stats["ub"])
[ia_list.append(ia_dict.get(i, "")) for i in slots] d_uc = dict(item="uc", value_slots=d_stats["uc"])
[ib_list.append(ia_dict.get(i, "")) for i in slots]
[ic_list.append(ia_dict.get(i, "")) for i in slots] i = [d_ia, d_ib, d_ic]
[pttl_list.append(ia_dict.get(i, "")) for i in slots] v = [d_ua, d_ub, d_uc]
[qttl_list.append(ia_dict.get(i, "")) for i in slots]
[ua_list.append(ia_dict.get(i, "")) for i in slots]
[ub_list.append(ia_dict.get(i, "")) for i in slots]
[uc_list.append(ia_dict.get(i, "")) for i in slots]
ia_value.update({"value_slots": ia_list})
ib_value.update({"value_slots": ib_list})
ic_value.update({"value_slots": ic_list})
pttl_value.update({"value_slots": pttl_list})
qttl_value.update({"value_slots": qttl_list})
ua_value.update({"value_slots": ua_list})
ub_value.update({"value_slots": ub_list})
uc_value.update({"value_slots": uc_list})
i.append(ia_value)
i.append(ib_value)
i.append(ic_value)
v.append(ua_value)
v.append(ub_value)
v.append(uc_value)
power.append(pttl_value)
power.append(qttl_value)
else: else:
i, v, power, ia_value, ic_value, uab_value, ucb_value, pttl_value, qttl_value \ d_ia = dict(item="ia", value_slots=d_stats["ia"])
= [], [], [], {"item": "ia"}, {"item": "ic"}, { d_ic = dict(item="ic", value_slots=d_stats["ic"])
"item": "uab"}, {"item": "ucb"}, {"item": "pttl"}, {"item": "qttl"} d_uab = dict(item="uab", value_slots=d_stats["uab"])
d_ucb = dict(item="ucb", value_slots=d_stats["ucb"])
ia_dict, ic_dict, pttl_dict, qttl_dict, uab_dict, ucb_dict, \ i = [d_ia, d_ic]
= {}, {}, {}, {}, {}, {} v = [d_uab, d_ucb]
[ia_dict.update({i.get("ts"): i.get("ia")}) for i in data] d_pttl = dict(item="pttl", value_slots=d_stats["pttl"])
[ic_dict.update({i.get("ts"): i.get("ic")}) for i in data] d_qttl = dict(item="qttl", value_slots=d_stats["qttl"])
[pttl_dict.update({i.get("ts"): i.get("pttl")}) for i in data] power = [d_pttl, d_qttl]
[qttl_dict.update({i.get("ts"): i.get("qttl")}) for i in data]
[uab_dict.update({i.get("ts"): i.get("ua")}) for i in data]
[ucb_dict.update({i.get("ts"): i.get("ub")}) for i in data]
ia_list, ic_list, pttl_list, qttl_list, uab_list, ucb_list \
= [], [], [], [], [], []
[ia_list.append(ia_dict.get(i, "")) for i in slots]
[ic_list.append(ia_dict.get(i, "")) for i in slots]
[pttl_list.append(ia_dict.get(i, "")) for i in slots]
[qttl_list.append(ia_dict.get(i, "")) for i in slots]
[uab_list.append(ia_dict.get(i, "")) for i in slots]
[ucb_list.append(ia_dict.get(i, "")) for i in slots]
ia_value.update({"value_slots": ia_list})
ic_value.update({"value_slots": ic_list})
pttl_value.update({"value_slots": pttl_list})
qttl_value.update({"value_slots": qttl_list})
uab_value.update({"value_slots": uab_list})
ucb_value.update({"value_slots": ucb_list})
i.append(ia_value)
i.append(ic_value)
v.append(uab_value)
v.append(ucb_value)
power.append(pttl_value)
power.append(qttl_value)
return i, v, power return i, v, power
async def get_point_data_chart_pds(ctnum, slots, data): async def get_point_data_chart_pds(ctnum, slots, data):
if ctnum == 3: if ctnum == 3:
i, v, power, ia_value, ib_value, ic_value, ua_value, ub_value, uc_value, pttl_value, qttl_value \ fields = ["ia", "ib", "ic", "ua", "ub", "uc", "pttl", "qttl"]
= [], [], [], {"item": "ia"}, {"item": "ib"}, {"item": "ic"}, { else:
"item": "ua"}, {"item": "ub"}, {"item": "uc"}, {"item": "pttl"}, { fields = ["ia", "ic", "uab", "ucb", "pttl", "qttl"]
"item": "qttl"}
d_parse = {field: {} for field in fields}
ia_dict, ib_dict, ic_dict, pttl_dict, qttl_dict, ua_dict, ub_dict, uc_dict \ for d_item in data:
= {}, {}, {}, {}, {}, {}, {}, {} for field in fields:
[ia_dict.update({i.get("create_time"): i.get("ia_mean")}) for i in ts = d_item.get("create_time")
data] d_parse[field][ts] = d_item.get(f"{field}_mean")
[ib_dict.update({i.get("create_time"): i.get("ib_mean")}) for i in
data] d_stats = {field: [] for field in fields}
[ic_dict.update({i.get("create_time"): i.get("ic_mean")}) for i in for field in fields:
data] d_stats[field] = [d_parse[field].get(s, "") for s in slots]
[pttl_dict.update({i.get("create_time"): i.get("pttl_mean")}) for i in
data] if ctnum == 3:
[qttl_dict.update({i.get("create_time"): i.get("qttl_mean")}) for i in d_ia = dict(item="ia", value_slots=d_stats["ia"])
data] d_ib = dict(item="ib", value_slots=d_stats["ib"])
[ua_dict.update({i.get("create_time"): i.get("ua_mean")}) for i in d_ic = dict(item="ic", value_slots=d_stats["ic"])
data] d_ua = dict(item="ua", value_slots=d_stats["ua"])
[ub_dict.update({i.get("create_time"): i.get("ub_mean")}) for i in d_ub = dict(item="ub", value_slots=d_stats["ub"])
data] d_uc = dict(item="uc", value_slots=d_stats["uc"])
[uc_dict.update({i.get("create_time"): i.get("uc_mean")}) for i in
data] i = [d_ia, d_ib, d_ic]
v = [d_ua, d_ub, d_uc]
ia_list, ib_list, ic_list, pttl_list, qttl_list, ua_list, ub_list, uc_list \
= [], [], [], [], [], [], [], []
[ia_list.append(ia_dict.get(i, "")) for i in slots]
[ib_list.append(ia_dict.get(i, "")) for i in slots]
[ic_list.append(ia_dict.get(i, "")) for i in slots]
[pttl_list.append(ia_dict.get(i, "")) for i in slots]
[qttl_list.append(ia_dict.get(i, "")) for i in slots]
[ua_list.append(ia_dict.get(i, "")) for i in slots]
[ub_list.append(ia_dict.get(i, "")) for i in slots]
[uc_list.append(ia_dict.get(i, "")) for i in slots]
ia_value.update({"value_slots": ia_list})
ib_value.update({"value_slots": ib_list})
ic_value.update({"value_slots": ic_list})
pttl_value.update({"value_slots": pttl_list})
qttl_value.update({"value_slots": qttl_list})
ua_value.update({"value_slots": ua_list})
ub_value.update({"value_slots": ub_list})
uc_value.update({"value_slots": uc_list})
i.append(ia_value)
i.append(ib_value)
i.append(ic_value)
v.append(ua_value)
v.append(ub_value)
v.append(uc_value)
power.append(pttl_value)
power.append(qttl_value)
else: else:
i, v, power, ia_value, ic_value, uab_value, ucb_value, pttl_value, qttl_value \ d_ia = dict(item="ia", value_slots=d_stats["ia"])
= [], [], [], {"item": "ia"}, {"item": "ic"}, { d_ic = dict(item="ic", value_slots=d_stats["ic"])
"item": "uab"}, {"item": "ucb"}, {"item": "pttl"}, {"item": "qttl"} d_uab = dict(item="uab", value_slots=d_stats["uab"])
d_ucb = dict(item="ucb", value_slots=d_stats["ucb"])
ia_dict, ic_dict, pttl_dict, qttl_dict, uab_dict, ucb_dict, \
= {}, {}, {}, {}, {}, {} i = [d_ia, d_ic]
[ia_dict.update({i.get("create_time"): i.get("ia_mean")}) for i in v = [d_uab, d_ucb]
data] d_pttl = dict(item="pttl", value_slots=d_stats["pttl"])
[ic_dict.update({i.get("create_time"): i.get("ic_mean")}) for i in d_qttl = dict(item="qttl", value_slots=d_stats["qttl"])
data] power = [d_pttl, d_qttl]
[pttl_dict.update({i.get("create_time"): i.get("pttl_mean")}) for i in
data]
[qttl_dict.update({i.get("create_time"): i.get("qttl_mean")}) for i in
data]
[uab_dict.update({i.get("create_time"): i.get("ua_mean")}) for i in
data]
[ucb_dict.update({i.get("create_time"): i.get("ub_mean")}) for i in
data]
ia_list, ic_list, pttl_list, qttl_list, uab_list, ucb_list \
= [], [], [], [], [], []
[ia_list.append(ia_dict.get(i, "")) for i in slots]
[ic_list.append(ia_dict.get(i, "")) for i in slots]
[pttl_list.append(ia_dict.get(i, "")) for i in slots]
[qttl_list.append(ia_dict.get(i, "")) for i in slots]
[uab_list.append(ia_dict.get(i, "")) for i in slots]
[ucb_list.append(ia_dict.get(i, "")) for i in slots]
ia_value.update({"value_slots": ia_list})
ic_value.update({"value_slots": ic_list})
pttl_value.update({"value_slots": pttl_list})
qttl_value.update({"value_slots": qttl_list})
uab_value.update({"value_slots": uab_list})
ucb_value.update({"value_slots": ucb_list})
i.append(ia_value)
i.append(ic_value)
v.append(uab_value)
v.append(ucb_value)
power.append(pttl_value)
power.append(qttl_value)
return i, v, power return i, v, power
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment