|
@@ -190,13 +190,16 @@ class RecentPestCountAPIView(APIView):
|
|
|
tp_lst = i.split("#")
|
|
tp_lst = i.split("#")
|
|
|
for k in tp_lst:
|
|
for k in tp_lst:
|
|
|
pest = k.split(",")
|
|
pest = k.split(",")
|
|
|
- p_0 = pest[0]
|
|
|
|
|
- p_1 = pest[1]
|
|
|
|
|
- p_name = insect_dict.get(p_0)
|
|
|
|
|
- if p_name not in pest_count.keys():
|
|
|
|
|
- pest_count[p_name] = int(p_1)
|
|
|
|
|
|
|
+ if len(pest) == 2:
|
|
|
|
|
+ p_0 = pest[0]
|
|
|
|
|
+ p_1 = pest[1]
|
|
|
|
|
+ p_name = insect_dict.get(p_0)
|
|
|
|
|
+ if p_name not in pest_count.keys():
|
|
|
|
|
+ pest_count[p_name] = int(p_1)
|
|
|
|
|
+ else:
|
|
|
|
|
+ pest_count[p_name] += int(p_1)
|
|
|
else:
|
|
else:
|
|
|
- pest_count[p_name] += int(p_1)
|
|
|
|
|
|
|
+ logger.error(f"害虫识别格式有误:{k}")
|
|
|
result = sorted(pest_count.items(), key=itemgetter(1), reverse=False)
|
|
result = sorted(pest_count.items(), key=itemgetter(1), reverse=False)
|
|
|
result = {m[0]:m[1] for m in result[-10:]}
|
|
result = {m[0]:m[1] for m in result[-10:]}
|
|
|
return Response({"code": 0, "msg": "success", "data": result})
|
|
return Response({"code": 0, "msg": "success", "data": result})
|