Merge branch 'master' of https://e.coding.net/ctcdevteam/ehs/ehs_server
This commit is contained in:
commit
874d427df3
|
@ -90,7 +90,7 @@ def fangtangfu(ip: str, pic_url: str):
|
||||||
image_id = 4
|
image_id = 4
|
||||||
request = BeiHangGrpc_pb2.JinYu_Request(zzid=image_id, imgUrl=pic_url)
|
request = BeiHangGrpc_pb2.JinYu_Request(zzid=image_id, imgUrl=pic_url)
|
||||||
response = stub.sendFA_Info(request)
|
response = stub.sendFA_Info(request)
|
||||||
if response.FAinfo == False:
|
if response.FAinfo is False:
|
||||||
return True, response
|
return True, response
|
||||||
return False, response
|
return False, response
|
||||||
|
|
||||||
|
|
|
@ -17,7 +17,7 @@ algo_dict = {
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
def ai_analyse(codes: list, global_img: str, face_img: str = None, is_dahua_pic: bool = True):
|
def ai_analyse(codes: list, global_img: str, face_img: str = '', is_dahua_pic: bool = True):
|
||||||
"""算法分析图片
|
"""算法分析图片
|
||||||
|
|
||||||
Args:
|
Args:
|
||||||
|
@ -59,7 +59,8 @@ def ai_analyse(codes: list, global_img: str, face_img: str = None, is_dahua_pic:
|
||||||
for x in res.FireinfoList:
|
for x in res.FireinfoList:
|
||||||
if x.fire == 3: # 气瓶倾倒
|
if x.fire == 3: # 气瓶倾倒
|
||||||
qiping_qd = True
|
qiping_qd = True
|
||||||
rectangle_dict['qiping'].append([(x.coord.uleft.x, x.coord.uleft.y), (x.coord.lright.x, x.coord.lright.y)]) # 加入矩形框
|
rectangle_dict['qiping'].append(
|
||||||
|
[(x.coord.uleft.x, x.coord.uleft.y), (x.coord.lright.x, x.coord.lright.y)]) # 加入矩形框
|
||||||
if x.fire == 0:
|
if x.fire == 0:
|
||||||
has_fire = True
|
has_fire = True
|
||||||
if x.fire == 2:
|
if x.fire == 2:
|
||||||
|
@ -77,7 +78,7 @@ def ai_analyse(codes: list, global_img: str, face_img: str = None, is_dahua_pic:
|
||||||
return results
|
return results
|
||||||
|
|
||||||
|
|
||||||
def ai_analyse_2(codes: list, global_img: str, face_img: str = None, is_dahua_pic: bool = True):
|
def ai_analyse_2(codes: list, global_img: str, face_img: str = '', is_dahua_pic: bool = True):
|
||||||
"""算法分析图片后保存并返回相对地址
|
"""算法分析图片后保存并返回相对地址
|
||||||
|
|
||||||
Args:
|
Args:
|
||||||
|
@ -86,14 +87,15 @@ def ai_analyse_2(codes: list, global_img: str, face_img: str = None, is_dahua_pi
|
||||||
face_img (str): 人脸图片url地址
|
face_img (str): 人脸图片url地址
|
||||||
"""
|
"""
|
||||||
results = ai_analyse(codes, global_img, face_img, is_dahua_pic)
|
results = ai_analyse(codes, global_img, face_img, is_dahua_pic)
|
||||||
if results: # 如果触发事件先保存下来
|
if results: # 如果触发事件先保存下来
|
||||||
from apps.ecm.service import save_dahua_pic
|
from apps.ecm.service import save_dahua_pic
|
||||||
global_img_path = save_dahua_pic(global_img)
|
global_img_path = save_dahua_pic(global_img)
|
||||||
global_img_local = settings.BASE_DIR + global_img_path
|
global_img_local = settings.BASE_DIR + global_img_path
|
||||||
draw(global_img_local, results) # 绘制矩形框
|
draw(global_img_local, results) # 绘制矩形框
|
||||||
results.update({'global_img': global_img_path})
|
results.update({'global_img': global_img_path})
|
||||||
return results
|
return results
|
||||||
|
|
||||||
|
|
||||||
def draw(path, results):
|
def draw(path, results):
|
||||||
rects = []
|
rects = []
|
||||||
for i in results:
|
for i in results:
|
||||||
|
@ -104,6 +106,5 @@ def draw(path, results):
|
||||||
for i in results:
|
for i in results:
|
||||||
for m in results[i]:
|
for m in results[i]:
|
||||||
cv2.rectangle(img, results[i][m][0], results[i][m][1], (0, 255, 0), 4)
|
cv2.rectangle(img, results[i][m][0], results[i][m][1], (0, 255, 0), 4)
|
||||||
cv2.putText(img, i, results[i][m][0], font, 2, (0,0,255), 1)
|
cv2.putText(img, i, results[i][m][0], font, 2, (0, 0, 255), 1)
|
||||||
cv2.imwrite(path, img)
|
cv2.imwrite(path, img)
|
||||||
|
|
||||||
|
|
Loading…
Reference in New Issue