Skip to content

Работа с камерами в потоке #1

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
ikamil wants to merge 1 commit into
base: main
Choose a base branch
from
Open

Работа с камерами в потоке #1

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
20 changes: 13 additions & 7 deletions data/dml.sql
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,12 +14,11 @@ create or replace function change(src text, i int, v text) returns text language
$$;

-- подмена некорректных или похожих символов
create or replace function unify_replace(src text) returns text language plpgsql immutable as $$
create or replace function unify_replace(src text, dict jsonb) returns text language plpgsql immutable as $$
declare res text := src;
REPLACE_ jsonb := '{"D": "0", "Q": "0", "O": "0", "R": "K", ".": "", ",": "", "/": "7", "V": "Y", "|": "", "I": "", " ": ""}';
r text; v text;
begin
FOR r, v IN SELECT * FROM jsonb_each_text(REPLACE_) LOOP
FOR r, v IN SELECT * FROM jsonb_each_text(dict) LOOP
-- RAISE NOTICE 'REPLACE %: % => %', res, r, v;
res := replace(res, r, v);
END LOOP;
Expand All @@ -29,12 +28,15 @@ $$;

-- Унификация номеров с подменой и заменой на позициях
create or replace function unify(src text) returns text language plpgsql immutable as $$
declare res text := unify_replace(src);
INPLACE jsonb := '{"0": {"4": "A", "X": "K", "V": "Y", "9": "B", "7": "T", "1": "T"},
declare
REPLACE_ jsonb := '{"D": "0", "Q": "0", "O": "0", "R": "K", ".": "", ",": "", "V": "Y", "|": "", "I": "", " ": ""}';
REPLACE2 jsonb := '{"/": "7"}';
res text := unify_replace(src, REPLACE_);
INPLACE jsonb := '{"0": {"4": "A", "X": "K", "V": "Y", "9": "B", "7": "T", "1": "T"},
"4,5": {"0": "C", "8": "B", "1": "T", "3": "B", "7": "T", "V": "Y", "X": "K", "9": "B"},
"1,2,3": {"B": "8", "A": "4"},
"6": {"M": "11"}}';
CHANGES jsonb := '{"10": {"7": ""}}';
CHANGES jsonb := '{"10": {"6": ""}}';
r text; v text; i_ text; d jsonb; ii text; i int; l_ text; c jsonb; ll text; l int;
begin
for i_, d in SELECT * FROM jsonb_each(INPLACE) LOOP
Expand Down Expand Up @@ -65,6 +67,8 @@ begin
end if;
end loop;
end loop;

res := unify_replace(res, REPLACE2);
return res;
end;
$$;
Expand All @@ -76,7 +80,7 @@ with src as (select (regexp_matches(payload, '''[0-9A-Z\.\/]{8,}''', 'g'))[1] ma
un as (select cnt, num, img, uni from trm where cnt > 1 or (num = uni and length(num) between 8 and 9)),
cnts as (select uni, max(cnt) qty, count(distinct num) nums, max(img) image from un group by uni)
select distinct uni||' : '||qty||'-'||nums, 'https://visiongate.ru/uploads/'||image url, qty, nums
from cnts join un using (uni) where (qty > 1 or nums > 1 )
from cnts join un using (uni) --where (qty > 1 or nums > 1 )
order by qty desc, nums desc;

-- <список из номеров> для добавления этих номеров на разрешение в локацию
Expand All @@ -90,3 +94,5 @@ from cnts join un using (uni) where (qty > 1 or nums > 1);

-- шаблон запроса на обновление списка допустимых номеров
update main_location set allowed = allowed||chr(13)||'<список из номеров>' where id = '<ИД локации>';

select unify('X000XX/116');
5 changes: 5 additions & 0 deletions docker-compose.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -34,3 +34,8 @@ services:
volumes:
- /var/web/visiongate:/code
restart: always
logging:
driver: "json-file"
options:
max-size: "10m"
max-file: "5"
6 changes: 3 additions & 3 deletions visiongate/main/admin.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -159,16 +159,16 @@ class CameraAdmin(LocationUserAdmin):
def videopreview(self, obj):
return mark_safe(f'<video controls width="450"><source src="{obj.sample.url}" type="video/mp4"/></video>' if not obj.url else """
<div id="vid"><div id="click" style="background-color: #EBEBEB; cursor: pointer" onClick=
"let str = document.getElementById('stream'); str.src = ''; str.src = '/video/%s/'; redraw();">
<img id="stream" src="/video/%s" alt="Просмотр видео"/><strong id="strong"></strong></div>
"let str = document.getElementById('stream'); str.src = ''; str.src = '/image/%s/'; redraw();">
<img id="stream" src="/image/%s" alt="Просмотр видео"/><strong id="strong"></strong></div>
<script>let clk = document.getElementById('click'); let stg = document.getElementById('strong');
function redraw(){stg.innerText=''; setTimeout(()=>{stg.innerText='Перезапустить';}, 31000);};redraw();</script></div>""" % (obj.id, obj.id))
videopreview.short_description = "Просмотр видео"

def controlpreview(self, obj):
return mark_safe("""<div id="iframe"><div id="click" style="background-color: #EBEBEB; cursor: pointer"
onClick="var frm = document.getElementById('iframe'); let ifrm = document.getElementById('ifrm'); if (ifrm) ifrm.remove(); var fr = document.createElement('iframe');
fr.id = 'ifrm'; fr.src = '/video/%s/'; fr.width = 600; fr.height = 300; fr.onLoad = function () {document.getElementById('click').click();}
fr.id = 'ifrm'; fr.src = '/image/%s/'; fr.width = 600; fr.height = 300; fr.onLoad = function () {document.getElementById('click').click();}
frm.appendChild(fr);"><strong>Включить модель детекции образов.</strong>"!" - обнаружено</div></div>""" % obj.id)
controlpreview.short_description = "Просмотр контроля"

Expand Down
Loading