diff --git a/ops/combine/BYOD-PC-TERMINALS-2026-11-18.md b/ops/combine/BYOD-PC-TERMINALS-2026-11-18.md new file mode 100644 index 0000000..5d3cb23 --- /dev/null +++ b/ops/combine/BYOD-PC-TERMINALS-2026-11-18.md @@ -0,0 +1,15 @@ +# BYOD и ПК как терминалы + +ПК — терминальный хост BYOD-решения, не аксессуар. + +| Модель | role | group | solution_class | deployment | +|---|---|---|---|---| +| ПК (BYOD) | pc | A_integration_terminals | vcs.terminal.pc | byod | +| HP Mini IP Conferencing PC | pc | A_integration_terminals | vcs.terminal.pc | byod | +| HP Poly Studio 7 Room Compute | pc | A_integration_terminals | vcs.terminal.pc | byod | +| UVC85-BYOD | kit | A_integration_terminals | vcs.byod.kit | byod | +| UVC85 | camera | D_usb_byod | vcs.camera.usb | | +| UVC86 | camera | D_usb_byod | vcs.camera.usb | | + +`UVC85-BYOD` = kit (`UVC85` + `BYOD-BOX`), алиасы `UVC85 BYOD 200` / `UVC85-BYOD 200`. +UVC85/UVC86 — камеры; с ПК образуют BYOD-решение без кодека. diff --git a/ops/combine/COMBINE-ANALOGS-STRATEGY.md b/ops/combine/COMBINE-ANALOGS-STRATEGY.md index ceaa627..ec7b420 100644 --- a/ops/combine/COMBINE-ANALOGS-STRATEGY.md +++ b/ops/combine/COMBINE-ANALOGS-STRATEGY.md @@ -62,6 +62,17 @@ - проверка: `SIP-T33P` не получает VCS-аналогов, `UVC86` получает камеры. - Прод не изменён. +## BYOD без терминала + +ПК — полноценный терминальный хост BYOD-решения, не аксессуар: + +- `ПК (BYOD)`, `HP Mini IP Conferencing PC` → `role=pc`, `vcs.terminal.pc`; +- `UVC85-BYOD` → `vcs.byod.kit` (компоненты `UVC85` + `BYOD-BOX`, алиасы `UVC85 BYOD 200`); +- `UVC85`/`UVC86` — камеры; с ПК дают BYOD-решение без кодека. + +Поэтому запрос «UVC85 BYOD 200» находит kit, а «HP Mini IP PC» — терминальные +альтернативы, не аксессуары. + ## Ограничение Цены, наличие и сроки поставки пока не в модели — без них «лучший аналог» diff --git a/ops/combine/catalog-p0-2026-11-18.yaml b/ops/combine/catalog-p0-2026-11-18.yaml index fe0ff23..37211a5 100644 --- a/ops/combine/catalog-p0-2026-11-18.yaml +++ b/ops/combine/catalog-p0-2026-11-18.yaml @@ -1652,9 +1652,9 @@ devices: - MVC-BYOD-Extender (Only work with MTR bundle) domain: vcs line: vcs.terminals - group: A_integration_terminals - role: codec - form_factor: terminal + group: D_usb_byod + role: sharing_hub + form_factor: accessory native_vcs: true protocols: [] protocols_status: unknown @@ -1662,7 +1662,7 @@ devices: kind: catalog verified: false version: '2026-11-18' - solution_class: vcs.kit.room + solution_class: vcs.sharing analog_group: vcs.kit.room sales_scope: own sip_context: none @@ -2144,10 +2144,10 @@ devices: model: UVC84 aliases: [] domain: vcs - line: vcs.terminals - group: A_integration_terminals - role: codec - form_factor: terminal + line: vcs.usb_byod + group: D_usb_byod + role: camera + form_factor: camera native_vcs: true protocols: [] protocols_status: unknown @@ -2166,10 +2166,10 @@ devices: model: UVC86 aliases: [] domain: vcs - line: vcs.terminals - group: A_integration_terminals - role: codec - form_factor: terminal + line: vcs.usb_byod + group: D_usb_byod + role: camera + form_factor: camera native_vcs: true protocols: [] protocols_status: unknown @@ -2188,10 +2188,10 @@ devices: model: UVC85 aliases: [] domain: vcs - line: vcs.terminals - group: A_integration_terminals - role: codec - form_factor: terminal + line: vcs.usb_byod + group: D_usb_byod + role: camera + form_factor: camera native_vcs: true protocols: [] protocols_status: unknown @@ -2211,10 +2211,10 @@ devices: aliases: - UVC86 E2 domain: vcs - line: vcs.terminals - group: A_integration_terminals - role: codec - form_factor: terminal + line: vcs.usb_byod + group: D_usb_byod + role: camera + form_factor: camera native_vcs: true protocols: [] protocols_status: unknown @@ -2233,10 +2233,10 @@ devices: model: UVC88 aliases: [] domain: vcs - line: vcs.terminals - group: A_integration_terminals - role: codec - form_factor: terminal + line: vcs.usb_byod + group: D_usb_byod + role: camera + form_factor: camera native_vcs: true protocols: [] protocols_status: unknown @@ -2255,10 +2255,10 @@ devices: model: UVC88(SV80) aliases: [] domain: vcs - line: vcs.terminals - group: A_integration_terminals - role: codec - form_factor: terminal + line: vcs.usb_byod + group: D_usb_byod + role: camera + form_factor: camera native_vcs: true protocols: [] protocols_status: unknown @@ -2638,11 +2638,11 @@ devices: vendor: yealink model: ПК (BYOD) aliases: [] - domain: unknown - line: vcs.usb_byod - group: D_usb_byod + domain: vcs + line: vcs.terminals + group: A_integration_terminals role: pc - form_factor: accessory + form_factor: pc native_vcs: false protocols: [] protocols_status: unknown @@ -2650,12 +2650,17 @@ devices: kind: catalog verified: false version: '2026-11-18' - solution_class: vcs.sharing - analog_group: vcs.sharing + solution_class: vcs.terminal.pc + analog_group: vcs.terminal.pc sales_scope: own sip_context: none name: ПК (BYOD) seen_in: [] + deployment: byod + requires: + - camera + - audio + - touch - id: yealink.teams-rooms-mtr-w vendor: yealink model: ПК с Teams Rooms (MTR-W) @@ -2865,25 +2870,31 @@ devices: vendor: yealink model: UVC85-BYOD aliases: + - UVC85 BYOD 200 - UVC85-BYOD + - UVC85-BYOD 200 domain: vcs - line: vcs.terminals + line: vcs.byod.kit group: A_integration_terminals - role: codec - form_factor: terminal - native_vcs: true + role: kit + form_factor: kit + native_vcs: false protocols: [] protocols_status: unknown source: kind: values-only verified: false version: '2026-11-18' - solution_class: vcs.camera.usb - analog_group: vcs.camera.usb + solution_class: vcs.byod.kit + analog_group: vcs.byod.kit sales_scope: own sip_context: none name: UVC85-BYOD seen_in: [] + deployment: byod + components: + - UVC85 + - BYOD-BOX - id: unknown.mvc-mcorekit-c5u vendor: yealink model: MVC MCoreKit-C5U @@ -5010,11 +5021,11 @@ devices: vendor: poly model: HP Mini IP Conferencing PC aliases: [] - domain: unknown - line: vcs.other - group: E_other - role: unknown - form_factor: accessory + domain: vcs + line: vcs.terminals + group: A_integration_terminals + role: pc + form_factor: pc native_vcs: false protocols: [] protocols_status: unknown @@ -5022,21 +5033,26 @@ devices: kind: research-seed verified: false version: '2026-11-18' - solution_class: vcs.accessory - analog_group: vcs.accessory + solution_class: vcs.terminal.pc + analog_group: vcs.terminal.pc sales_scope: alternative sip_context: none name: HP Mini IP Conferencing PC seen_in: [] + deployment: byod + requires: + - camera + - audio + - touch - id: poly.hp-poly-studio-7-room-compute vendor: poly model: HP Poly Studio 7 Room Compute aliases: [] - domain: unknown - line: vcs.other - group: E_other - role: unknown - form_factor: accessory + domain: vcs + line: vcs.terminals + group: A_integration_terminals + role: pc + form_factor: pc native_vcs: false protocols: [] protocols_status: unknown @@ -5044,12 +5060,17 @@ devices: kind: research-seed verified: false version: '2026-11-18' - solution_class: vcs.accessory - analog_group: vcs.accessory + solution_class: vcs.terminal.pc + analog_group: vcs.terminal.pc sales_scope: alternative sip_context: none name: HP Poly Studio 7 Room Compute seen_in: [] + deployment: byod + requires: + - camera + - audio + - touch - id: poly.hp-poly-studio-v72 vendor: poly model: HP Poly Studio V72 diff --git a/ops/scripts/build_reports.py b/ops/scripts/build_reports.py index 4f63d05..9f56fb4 100644 --- a/ops/scripts/build_reports.py +++ b/ops/scripts/build_reports.py @@ -15,6 +15,7 @@ FILES = [ ("P0.6 retry-очередь", "/root/buryan-infra/ops/combine/P0-RETRY-QUEUE-2026-11-18.md"), ("Модели других вендоров", "/root/buryan-infra/ops/combine/VENDORS-OTHER-REPORT-2026-11-18.md"), ("Стратегия аналогов", "/root/buryan-infra/ops/combine/COMBINE-ANALOGS-STRATEGY.md"), + ("BYOD и ПК", "/root/buryan-infra/ops/combine/BYOD-PC-TERMINALS-2026-11-18.md"), ("P0.7 мусорные факты", "/root/buryan-infra/ops/combine/P0-JUNK-REPORT-2026-11-18.md"), ("Нормализация каталога", "/root/buryan-infra/ops/combine/NORMALIZATION-REPORT-2026-11-18.md"), ("Стратегия Комбайна", "/root/buryan-infra/ops/combine/STRATEGY-2026-11-18.md"), diff --git a/ops/scripts/fix_byod_pc.py b/ops/scripts/fix_byod_pc.py new file mode 100644 index 0000000..f457a71 --- /dev/null +++ b/ops/scripts/fix_byod_pc.py @@ -0,0 +1,84 @@ +#!/usr/bin/env python3 +"""BYOD: ПК — терминальный хост, UVC85 BYOD — kit, UVC — камеры.""" +import yaml + +P = "/root/buryan-infra/ops/combine/catalog-p0-2026-11-18.yaml" +R = "/root/buryan-infra/ops/combine/BYOD-PC-TERMINALS-2026-11-18.md" +d = yaml.safe_load(open(P, encoding="utf-8")) +devs = d["devices"] + + +def get(name): + for x in devs: + if (x.get("model") or x.get("name")) == name: + return x + return None + + +def pc(x, own=False): + if not x: + return + x["role"] = "pc" + x["domain"] = "vcs" + x["group"] = "A_integration_terminals" + x["line"] = "vcs.terminals" + x["solution_class"] = "vcs.terminal.pc" + x["analog_group"] = "vcs.terminal.pc" + x["form_factor"] = "pc" + x["native_vcs"] = False + x["sales_scope"] = "own" if own else "alternative" + x["deployment"] = "byod" + x["requires"] = ["camera", "audio", "touch"] + + +pc(get("ПК (BYOD)"), own=True) +pc(get("HP Mini IP Conferencing PC")) +pc(get("HP Poly Studio 7 Room Compute")) + +kit = get("UVC85-BYOD") +if kit: + kit["role"] = "kit" + kit["group"] = "A_integration_terminals" + kit["line"] = "vcs.byod.kit" + kit["solution_class"] = "vcs.byod.kit" + kit["analog_group"] = "vcs.byod.kit" + kit["form_factor"] = "kit" + kit["native_vcs"] = False + kit["deployment"] = "byod" + kit["aliases"] = sorted(set((kit.get("aliases") or []) + ["UVC85 BYOD 200", "UVC85-BYOD 200"])) + kit["components"] = ["UVC85", "BYOD-BOX"] + +for x in devs: + n = (x.get("model") or x.get("name") or "").lower() + if n.startswith("uvc") and "byod" not in n: + x["role"] = "camera" + x["group"] = "D_usb_byod" + x["line"] = "vcs.usb_byod" + x["solution_class"] = "vcs.camera.usb" + x["analog_group"] = "vcs.camera.usb" + x["form_factor"] = "camera" + if n == "byod-box": + x["role"] = "sharing_hub" + x["group"] = "D_usb_byod" + x["solution_class"] = "vcs.sharing" + x["form_factor"] = "accessory" + if n == "mvc-byod-extender": + x["role"] = "sharing_hub" + x["group"] = "D_usb_byod" + x["solution_class"] = "vcs.sharing" + x["form_factor"] = "accessory" + +yaml.safe_dump(d, open(P, "w", encoding="utf-8"), allow_unicode=True, sort_keys=False) +names = ["ПК (BYOD)", "HP Mini IP Conferencing PC", "HP Poly Studio 7 Room Compute", "UVC85-BYOD", "UVC85", "UVC86"] +lines = ["# BYOD и ПК как терминалы", "", + "ПК — терминальный хост BYOD-решения, не аксессуар.", "", + "| Модель | role | group | solution_class | deployment |", "|---|---|---|---|---|"] +for n in names: + x = get(n) + if x: + lines.append("| %s | %s | %s | %s | %s |" % (n, x.get("role"), x.get("group"), + x.get("solution_class"), x.get("deployment", ""))) +lines += ["", "`UVC85-BYOD` = kit (`UVC85` + `BYOD-BOX`), алиасы `UVC85 BYOD 200` / `UVC85-BYOD 200`.", + "UVC85/UVC86 — камеры; с ПК образуют BYOD-решение без кодека."] +open(R, "w", encoding="utf-8").write("\n".join(lines) + "\n") +print("fixed byod/pc", len(devs)) diff --git a/ops/work/web/app.py b/ops/work/web/app.py index a1a559e..23d7d6d 100644 --- a/ops/work/web/app.py +++ b/ops/work/web/app.py @@ -112,9 +112,11 @@ class Data: def hosts(self): out = [] for k, v in self.devices.items(): - if v["role"] != "codec" or not self.edges.get(k): + if v["role"] not in ("codec", "pc"): continue - acc = [e for e in self.edges[k] if e.get("supported")] + if v["role"] != "pc" and not self.edges.get(k): + continue + acc = [e for e in self.edges.get(k, []) if e.get("supported")] out.append({"key": k, "name": v["name"], "accessories": len(acc)}) return sorted(out, key=lambda x: x["name"]) @@ -152,6 +154,7 @@ class Data: "sharing_or_hub": {"in": ["USB"], "out": ["HDMI"]}, "mount": {"in": [], "out": []}, "codec": {"in": ["LAN"], "out": ["HDMI", "USB", "VCH"]}, + "pc": {"in": ["USB", "LAN"], "out": ["HDMI"]}, } # ── порты устройства для схемы ── @@ -877,12 +880,14 @@ def analog_search(query, domain="vcs"): target = None if q: for d in devices: - if _dev_name(d).lower() == q.lower(): + names = [_dev_name(d)] + [str(a) for a in (d.get("aliases") or [])] + if any(q.lower() == n.lower() for n in names): target = d break if target is None: for d in devices: - if q.lower() in _dev_name(d).lower(): + names = [_dev_name(d)] + [str(a) for a in (d.get("aliases") or [])] + if any(q.lower() in n.lower() for n in names): target = d break parsed = {"class": "", "protocols": [], "features": [], "note": ""} @@ -971,7 +976,9 @@ def analog_search(query, domain="vcs"): parsed["note"] = (parsed["note"] + "; " if parsed["note"] else "") + "нет подтверждённых features 4K" return {"query": q, "domain": domain, "target": ({"name": _dev_name(target), "vendor": target.get("vendor"), - "solution_class": target.get("solution_class")} if target else None), + "solution_class": target.get("solution_class"), + "deployment": target.get("deployment"), + "components": target.get("components") or []} if target else None), "parsed": parsed, "alternatives": cand[:12], "note": "Только same domain + solution_class; телефония не предлагается для VCS."} diff --git a/ops/work/web/reports/BYOD-PC-TERMINALS-2026-11-18.html b/ops/work/web/reports/BYOD-PC-TERMINALS-2026-11-18.html new file mode 100644 index 0000000..8654fde --- /dev/null +++ b/ops/work/web/reports/BYOD-PC-TERMINALS-2026-11-18.html @@ -0,0 +1,21 @@ +
+# BYOD и ПК как терминалы + +ПК — терминальный хост BYOD-решения, не аксессуар. + +| Модель | role | group | solution_class | deployment | +|---|---|---|---|---| +| ПК (BYOD) | pc | A_integration_terminals | vcs.terminal.pc | byod | +| HP Mini IP Conferencing PC | pc | A_integration_terminals | vcs.terminal.pc | byod | +| HP Poly Studio 7 Room Compute | pc | A_integration_terminals | vcs.terminal.pc | byod | +| UVC85-BYOD | kit | A_integration_terminals | vcs.byod.kit | byod | +| UVC85 | camera | D_usb_byod | vcs.camera.usb | | +| UVC86 | camera | D_usb_byod | vcs.camera.usb | | + +`UVC85-BYOD` = kit (`UVC85` + `BYOD-BOX`), алиасы `UVC85 BYOD 200` / `UVC85-BYOD 200`. +UVC85/UVC86 — камеры; с ПК образуют BYOD-решение без кодека. +\ No newline at end of file diff --git a/ops/work/web/reports/COMBINE-ANALOGS-STRATEGY.html b/ops/work/web/reports/COMBINE-ANALOGS-STRATEGY.html index 9b66057..df1e92b 100644 --- a/ops/work/web/reports/COMBINE-ANALOGS-STRATEGY.html +++ b/ops/work/web/reports/COMBINE-ANALOGS-STRATEGY.html @@ -67,8 +67,27 @@ a{color:#58a6ff} .nav{margin-bottom:16px} h1{font-size:22px} - проверка: `SIP-T33P` не получает VCS-аналогов, `UVC86` получает камеры. - Прод не изменён. +## BYOD без терминала + +ПК — полноценный терминальный хост BYOD-решения, не аксессуар: + +- `ПК (BYOD)`, `HP Mini IP Conferencing PC` → `role=pc`, `vcs.terminal.pc`; +- `UVC85-BYOD` → `vcs.byod.kit` (компоненты `UVC85` + `BYOD-BOX`, алиасы `UVC85 BYOD 200`); +- `UVC85`/`UVC86` — камеры; с ПК дают BYOD-решение без кодека. + +Поэтому запрос «UVC85 BYOD 200» находит kit, а «HP Mini IP PC» — терминальные +альтернативы, не аксессуары. + ## Ограничение Цены, наличие и сроки поставки пока не в модели — без них «лучший аналог» остаётся техническим, а не коммерческим. Это следующий слой. + +## Реализовано 18.11.2026 + +- API: `GET /api/analogs?q=...&domain=vcs|telephony` в `combine-web`. +- UI: вкладка **«Аналоги»** в `http://192.168.1.10:8095/`. +- Прод-каталог 284 (281 уникального после `norm`), бэкап и откат — + `ops/combine/P0-PROMOTION-2026-11-18.md`. +