diff --git a/AGENTS.md b/AGENTS.md index 6d68079..97bbd36 100644 --- a/AGENTS.md +++ b/AGENTS.md @@ -42,6 +42,7 @@ Codex는 이 저장소에서 작업을 시작하기 전에 **반드시 아래 - 자산관리 (`app/modules/asset/`, `asset_db`) — 사무집기·전산장비 등록/배정/반납/상태·구매/보증·이력. HWiNFO XML 분석·사양 조회·이전 보고서와 원본 보존. 권한키 `asset`, 환경변수 `ASSET_DB_URL`. + 사진 등록/갤러리·모니터 자산 조회/등록/연결·수퍼 관리자 삭제(이력/원본 보존). 기존 설치는 마이그레이션 `asset_db_002_photos_monitors.sql` 필요. DB 미설정 시 저장 비활성, XML 분석 미리보기 가능. DB 생성은 사용자가 서버 명령으로 직접 진행. 상세 `docs/ASSET_MODULE.md`. --- diff --git a/app/modules/asset/db.py b/app/modules/asset/db.py index 8060d41..697277f 100644 --- a/app/modules/asset/db.py +++ b/app/modules/asset/db.py @@ -10,6 +10,8 @@ from psycopg.types.json import Jsonb from psycopg_pool import ConnectionPool from .store import AssetConflict, transition +from .media import MAX_PHOTOS +from .monitors import compatible_monitor, monitor_devices FIELDS = ("tag", "name", "category", "manufacturer", "model", "serial", "location", "department", "purchased_on", "purchase_cost", "vendor", "warranty_until", "notes") @@ -25,7 +27,7 @@ def serialize(row): def filters(q="", category="", status="", location="", assignee="", warranty=False, group=""): - conditions, params = ["TRUE"], [] + conditions, params = ["a.deleted_at IS NULL"], [] if q: # %와 _도 입력한 글자 그대로 검색합니다. 검색어는 SQL과 분리해서 전달합니다. value = "%" + q.replace("\\", "\\\\").replace("%", "\\%").replace("_", "\\_") + "%" @@ -55,7 +57,9 @@ class AssetStore: def health(self): with self._pool.connection(timeout=5) as conn: - conn.execute("SELECT id FROM assets LIMIT 1") + conn.execute("SELECT id,deleted_at FROM assets LIMIT 1") + conn.execute("SELECT id FROM asset_photos LIMIT 0") + conn.execute("SELECT monitor_key FROM asset_monitor_links LIMIT 0") def list_assets(self, *, page=1, page_size=25, sort="updated", **kwargs): # 전체 개수와 목록을 같은 시점의 데이터로 읽어 페이지 숫자가 어긋나지 않게 합니다. @@ -82,29 +86,32 @@ class AssetStore: coalesce(sum(purchase_cost) FILTER(WHERE status<>'retired'),0) AS purchase_total, count(*) FILTER(WHERE status<>'retired' AND warranty_until BETWEEN (now() AT TIME ZONE 'Asia/Seoul')::date AND (now() AT TIME ZONE 'Asia/Seoul')::date+30) AS warranty_soon - FROM assets""").fetchone() - categories = conn.execute("SELECT category,count(*) AS count FROM assets GROUP BY category ORDER BY count(*) DESC,category").fetchall() - locations = conn.execute("SELECT DISTINCT location FROM assets WHERE location<>'' ORDER BY location").fetchall() - activity = conn.execute("SELECT e.*,a.tag,a.name FROM asset_events e JOIN assets a ON a.id=e.asset_id ORDER BY e.id DESC LIMIT 12").fetchall() + FROM assets WHERE deleted_at IS NULL""").fetchone() + categories = conn.execute("SELECT category,count(*) AS count FROM assets WHERE deleted_at IS NULL GROUP BY category ORDER BY count(*) DESC,category").fetchall() + locations = conn.execute("SELECT DISTINCT location FROM assets WHERE location<>'' AND deleted_at IS NULL ORDER BY location").fetchall() + activity = conn.execute("SELECT e.*,a.tag,a.name FROM asset_events e JOIN assets a ON a.id=e.asset_id WHERE a.deleted_at IS NULL ORDER BY e.id DESC LIMIT 12").fetchall() return {"totals": serialize(totals), "categories": categories, "locations": [r["location"] for r in locations], "activity": [serialize(r) for r in activity]} def detail(self, asset_id): with self._pool.connection() as conn, conn.transaction(): conn.execute("SET TRANSACTION ISOLATION LEVEL REPEATABLE READ READ ONLY") - asset = conn.execute("SELECT * FROM assets WHERE id=%s", (asset_id,)).fetchone() + asset = conn.execute("SELECT * FROM assets WHERE id=%s AND deleted_at IS NULL", (asset_id,)).fetchone() if not asset: raise KeyError(asset_id) reports = conn.execute("SELECT id,filename,sha256,uploaded_at,actor,parsed->'summary' AS summary,parsed->>'scan_time' AS scan_time FROM asset_reports WHERE asset_id=%s ORDER BY uploaded_at DESC,id DESC", (asset_id,)).fetchall() report = conn.execute("SELECT id,filename,uploaded_at,parsed FROM asset_reports WHERE id=%s AND asset_id=%s", (asset["latest_report_id"], asset_id)).fetchone() if asset["latest_report_id"] else None events = conn.execute("SELECT * FROM asset_events WHERE asset_id=%s ORDER BY id DESC LIMIT 200", (asset_id,)).fetchall() - return {"asset": serialize(asset), "report": serialize(report), "reports": [serialize(r) for r in reports], "events": [serialize(r) for r in events]} + photos = conn.execute("SELECT id,filename,width,height,uploaded_at,actor FROM asset_photos WHERE asset_id=%s ORDER BY uploaded_at DESC,id", (asset_id,)).fetchall() + monitors = self._monitor_matches(conn, asset_id, report["parsed"]) if report else [] + return {"asset": serialize(asset), "report": serialize(report), "reports": [serialize(r) for r in reports], + "events": [serialize(r) for r in events], "photos": [serialize(r) for r in photos], "monitors": monitors} @staticmethod def _lock(conn, asset_id, version): # 같은 자산을 동시에 변경할 때 먼저 저장한 사용자의 값을 보호합니다. - asset = conn.execute("SELECT * FROM assets WHERE id=%s FOR UPDATE", (asset_id,)).fetchone() - if not asset: + asset = conn.execute("SELECT * FROM assets WHERE id=%s AND deleted_at IS NULL FOR UPDATE", (asset_id,)).fetchone() + if not asset or asset.get("deleted_at"): raise KeyError(asset_id) if asset["version"] != version: raise AssetConflict("다른 사용자가 수정했습니다. 상세 화면을 새로 열고 다시 시도하세요.") @@ -116,18 +123,22 @@ class AssetStore: (asset_id, actor, kind, note, Jsonb(changes))) def create(self, payload, actor, report=None): + with self._pool.connection() as conn, conn.transaction(): + return self._create(conn, payload, actor, report) + + def _create(self, conn, payload, actor, report=None): + # 모니터 등록도 같은 트랜잭션 안에서 자산 생성과 연결을 함께 처리합니다. data = payload.model_dump() asset_id = uuid.uuid4().hex - with self._pool.connection() as conn, conn.transaction(): - if not data["tag"]: - data["tag"] = "AST-" + str(conn.execute("SELECT nextval('asset_tag_seq') AS n").fetchone()["n"]).zfill(6) - conn.execute(f"INSERT INTO assets(id,{','.join(FIELDS)}) VALUES({','.join(['%s'] * (len(FIELDS) + 1))})", - [asset_id, *[data[k] for k in FIELDS]]) - self._event(conn, asset_id, actor, "create", "자산 등록", {"after": serialize(data)}) - if report: - if data["category"] != "computer": - raise ValueError("HWiNFO 보고서는 컴퓨터 자산에만 연결할 수 있습니다.") - self._save_report(conn, asset_id, actor, *report) + if not data["tag"]: + data["tag"] = "AST-" + str(conn.execute("SELECT nextval('asset_tag_seq') AS n").fetchone()["n"]).zfill(6) + conn.execute(f"INSERT INTO assets(id,{','.join(FIELDS)}) VALUES({','.join(['%s'] * (len(FIELDS) + 1))})", + [asset_id, *[data[k] for k in FIELDS]]) + self._event(conn, asset_id, actor, "create", "자산 등록", {"after": serialize(data)}) + if report: + if data["category"] != "computer": + raise ValueError("HWiNFO 보고서는 컴퓨터 자산에만 연결할 수 있습니다.") + self._save_report(conn, asset_id, actor, *report) return asset_id def update(self, asset_id, payload, actor): @@ -175,9 +186,90 @@ class AssetStore: return self._save_report(conn, asset_id, actor, filename, raw, parsed) def report(self, asset_id, report_id, *, raw=False): - columns = "filename,raw_xml" if raw else "id,filename,parsed,uploaded_at" + columns = "r.filename,r.raw_xml" if raw else "r.id,r.filename,r.parsed,r.uploaded_at" with self._pool.connection() as conn: - row = conn.execute(f"SELECT {columns} FROM asset_reports WHERE asset_id=%s AND id=%s", (asset_id, report_id)).fetchone() + row = conn.execute(f"SELECT {columns} FROM asset_reports r JOIN assets a ON a.id=r.asset_id WHERE r.asset_id=%s AND r.id=%s AND a.deleted_at IS NULL", (asset_id, report_id)).fetchone() if not row: raise KeyError(report_id) return serialize(row) + + def delete(self, asset_id, version, actor, note): + # 수퍼 관리자 삭제도 이력과 원본은 보존하고 대장·다운로드에서 제외합니다. + with self._pool.connection() as conn, conn.transaction(): + self._lock(conn, asset_id, version) + self._event(conn, asset_id, actor, "delete", note, {}) + conn.execute("UPDATE assets SET deleted_at=now(),deleted_by=%s,version=version+1,updated_at=now() WHERE id=%s", (actor, asset_id)) + + def add_photo(self, asset_id, version, actor, filename, image, mime, width, height): + with self._pool.connection() as conn, conn.transaction(): + self._lock(conn, asset_id, version) + count = conn.execute("SELECT count(*) AS n FROM asset_photos WHERE asset_id=%s", (asset_id,)).fetchone()["n"] + if count >= MAX_PHOTOS: + raise ValueError(f"사진은 자산당 {MAX_PHOTOS}개까지 등록할 수 있습니다.") + photo_id = uuid.uuid4().hex + conn.execute("INSERT INTO asset_photos(id,asset_id,filename,image,mime,width,height,actor) VALUES(%s,%s,%s,%s,%s,%s,%s,%s)", + (photo_id, asset_id, filename, image, mime, width, height, actor)) + conn.execute("UPDATE assets SET version=version+1,updated_at=now() WHERE id=%s", (asset_id,)) + self._event(conn, asset_id, actor, "photo", filename, {"photo_id": photo_id}) + return photo_id + + def photo(self, asset_id, photo_id): + with self._pool.connection() as conn: + row = conn.execute("SELECT p.image,p.mime FROM asset_photos p JOIN assets a ON a.id=p.asset_id WHERE p.asset_id=%s AND p.id=%s AND a.deleted_at IS NULL", (asset_id, photo_id)).fetchone() + if not row: + raise KeyError(photo_id) + return row + + @staticmethod + def _monitor_matches(conn, computer_id, parsed): + result = [] + for device in monitor_devices(parsed): + linked = conn.execute("SELECT a.* FROM asset_monitor_links l JOIN assets a ON a.id=l.monitor_asset_id WHERE l.computer_id=%s AND l.monitor_key=%s AND a.category='monitor' AND a.deleted_at IS NULL", (computer_id, device["key"])).fetchone() + matches = conn.execute("SELECT * FROM assets WHERE category='monitor' AND deleted_at IS NULL AND lower(btrim(serial))=%s ORDER BY id LIMIT 21", (device["serial"].casefold(),)).fetchall() if device["serial"] else [] + compatible = [a for a in matches if compatible_monitor(a, device)] + asset = linked or (compatible[0] if len(compatible) == 1 else None) + candidates = matches if not asset else [] + if not asset and not candidates: + candidates = conn.execute("SELECT * FROM assets WHERE category='monitor' AND deleted_at IS NULL AND (lower(btrim(model))=%s OR lower(btrim(name))=%s) ORDER BY id LIMIT 20", (device["model"].casefold(), device["name"].casefold())).fetchall() + result.append({**device, "asset": serialize(asset), "candidates": [serialize(r) for r in candidates], + "match": "linked" if linked else "serial" if asset else "unconfirmed"}) + return result + + def report_monitors(self, asset_id, report_id): + with self._pool.connection() as conn, conn.transaction(): + conn.execute("SET TRANSACTION ISOLATION LEVEL REPEATABLE READ READ ONLY") + row = conn.execute("SELECT r.parsed FROM asset_reports r JOIN assets a ON a.id=r.asset_id WHERE r.asset_id=%s AND r.id=%s AND a.deleted_at IS NULL", (asset_id, report_id)).fetchone() + if not row: + raise KeyError(report_id) + return self._monitor_matches(conn, asset_id, row["parsed"]) + + def register_monitor(self, computer_id, index, payload, actor): + with self._pool.connection() as conn, conn.transaction(): + computer = self._lock(conn, computer_id, payload.version) + if computer["category"] != "computer" or computer["latest_report_id"] != payload.report_id: + raise AssetConflict("최신 컴퓨터 보고서를 다시 열고 모니터를 등록하세요.") + row = conn.execute("SELECT parsed FROM asset_reports WHERE asset_id=%s AND id=%s", (computer_id, payload.report_id)).fetchone() + devices = monitor_devices(row["parsed"]) if row else [] + if index < 0 or index >= len(devices): + raise KeyError(index) + device = devices[index] + # 서로 다른 컴퓨터에서 동일 시리얼을 동시에 등록하는 경우도 중복을 막습니다. + if device["serial"]: + conn.execute("SELECT pg_advisory_xact_lock(hashtextextended(%s,0))", ("asset-monitor:" + device["serial"].casefold(),)) + if payload.asset_id: + target = conn.execute("SELECT * FROM assets WHERE id=%s AND deleted_at IS NULL FOR UPDATE", (payload.asset_id,)).fetchone() + if not target or target["category"] != "monitor": + raise ValueError("등록된 모니터 자산을 선택하세요.") + monitor_id = target["id"] + else: + match = self._monitor_matches(conn, computer_id, row["parsed"])[index] + if match["asset"] or (device["serial"] and match["candidates"]): + raise AssetConflict("이미 등록된 모니터가 있습니다. 기존 자산을 확인하고 연결하세요.") + # 보고서의 실제 시리얼을 유지해야 이후 보고서에서도 같은 장비를 찾습니다. + data = payload.asset.model_copy(update={"serial": device["serial"] or payload.asset.serial}) + monitor_id = self._create(conn, data, actor) + conn.execute("INSERT INTO asset_monitor_links(computer_id,monitor_key,monitor_asset_id,actor) VALUES(%s,%s,%s,%s) ON CONFLICT(computer_id,monitor_key) DO UPDATE SET monitor_asset_id=EXCLUDED.monitor_asset_id,actor=EXCLUDED.actor,linked_at=now()", + (computer_id, device["key"], monitor_id, actor)) + conn.execute("UPDATE assets SET version=version+1,updated_at=now() WHERE id=%s", (computer_id,)) + self._event(conn, computer_id, actor, "monitor", "모니터 자산 연결", {"monitor_asset_id": monitor_id, "model": device["model"]}) + return monitor_id diff --git a/app/modules/asset/media.py b/app/modules/asset/media.py new file mode 100644 index 0000000..07a5b52 --- /dev/null +++ b/app/modules/asset/media.py @@ -0,0 +1,38 @@ +"""사진을 실제 이미지로 확인하고 위치 정보 등 메타데이터를 제거합니다.""" +import io +import warnings + +from PIL import Image, ImageOps, UnidentifiedImageError + +MAX_PHOTO_BYTES = 8 * 1024 * 1024 +MAX_STORED_BYTES = 5 * 1024 * 1024 +MAX_PHOTOS = 10 + + +def prepare_photo(raw): + if not raw or len(raw) > MAX_PHOTO_BYTES: + raise ValueError("사진은 비어 있지 않은 8 MB 이하 파일이어야 합니다.") + try: + with warnings.catch_warnings(): + warnings.simplefilter("error", Image.DecompressionBombWarning) + with Image.open(io.BytesIO(raw)) as source: + if source.format not in {"JPEG", "PNG", "WEBP"}: + raise ValueError("JPG, PNG, WebP 사진만 등록할 수 있습니다.") + if source.width * source.height > 20_000_000: + raise ValueError("사진은 2천만 화소 이하로 등록하세요.") + source.load() + image = ImageOps.exif_transpose(source) + image.thumbnail((2400, 2400)) + transparent = "A" in image.getbands() or "transparency" in image.info + mode = "RGBA" if transparent else "RGB" + # 새 캔버스에 복사해 EXIF, GPS, 촬영기기 정보를 저장하지 않습니다. + clean = Image.new(mode, image.size) + clean.paste(image.convert(mode)) + output = io.BytesIO() + clean.save(output, format="PNG" if transparent else "JPEG", **({} if transparent else {"quality": 88})) + data = output.getvalue() + if len(data) > MAX_STORED_BYTES: + raise ValueError("사진을 압축해 다시 등록하세요. 저장 크기는 5 MB 이하입니다.") + return data, "image/png" if transparent else "image/jpeg", clean.width, clean.height + except (UnidentifiedImageError, OSError, SyntaxError, Image.DecompressionBombError, Image.DecompressionBombWarning) as exc: + raise ValueError("사진을 읽을 수 없습니다. 정상적인 JPG, PNG, WebP 파일을 선택하세요.") from exc diff --git a/app/modules/asset/monitors.py b/app/modules/asset/monitors.py new file mode 100644 index 0000000..4ec62d2 --- /dev/null +++ b/app/modules/asset/monitors.py @@ -0,0 +1,47 @@ +"""이전 보고서에도 적용할 수 있도록 저장된 모니터 항목에서 식별 정보를 읽습니다.""" +import hashlib +import re + + +def usable_serial(value): + value = value.strip() + if value.casefold() in {"", "unknown", "n/a", "none", "not specified", "serial number", "알 수 없음"}: + return "" + if re.fullmatch(r"[0\s-]+", value): + return "" + return value + + +def compatible_monitor(asset, device): + """다른 제조사나 다른 모델이 같은 시리얼을 쓰면 자동 연결하지 않습니다.""" + def normalized(value): + return "".join(c for c in value.casefold() if c.isalnum()) + brand = normalized(asset.get("manufacturer", "")) + reported_brand = normalized(device["manufacturer"]) + if brand and reported_brand and brand != reported_brand: + return False + model = normalized(asset.get("model", "")) + if not model: + return True + return any(model == value or len(model) >= 4 and model in value + for value in (normalized(device["model"]), normalized(device["name"]))) + + +def monitor_devices(parsed): + devices = [] + for index, item in enumerate(parsed.get("devices", {}).get("MONITOR", [])): + props = item.get("properties", []) + def pick(*labels, kind=""): + return next((p["value"].strip() for p in props if p.get("label", "").casefold() in + {label.casefold() for label in labels} or kind and p.get("type") == kind), "") + name = item.get("name", "모니터") + model = pick("모니터 이름(제조업체)", "Monitor Name (Manuf)", "Monitor Name (Manufacturer)") or name + serial = usable_serial(pick("일련 번호", "Serial Number", "Monitor Serial Number")) + instance = pick("디바이스 인스턴스 ID", "Device Instance ID", kind="DeviceInstanceId") + # 시리얼이 없는 장치는 모델명만으로 동일 자산이라고 판단하지 않습니다. + identity = ("serial:" + serial.casefold() + ":" + model.casefold()) if serial else ( + "instance:" + instance.casefold() if instance else f"report:{parsed.get('sha256', '')}:{index}") + devices.append({"index": index, "key": hashlib.sha256(identity.encode()).hexdigest(), + "name": name, "model": model[:200], "serial": serial[:200], + "manufacturer": name.split(" ", 1)[0][:150], "properties": props}) + return devices diff --git a/app/modules/asset/router.py b/app/modules/asset/router.py index 25d2fe2..d89c49a 100644 --- a/app/modules/asset/router.py +++ b/app/modules/asset/router.py @@ -19,6 +19,8 @@ from starlette.concurrency import run_in_threadpool from .hwinfo import MAX_REPORT_BYTES, parse_hwinfo from .store import ActionInput, AssetConflict, AssetInput, AssetUpdate, CATEGORIES, STATUSES +from .store import DeleteInput, MonitorInput +from .media import MAX_PHOTO_BYTES, prepare_photo router = APIRouter(prefix="/asset", tags=["asset"]) @@ -42,6 +44,17 @@ def _write(request: Request, user=Depends(_user)): return user +def _super(user): + from app.store import SUPER_ADMIN_EMAIL + return user.get("email", "").lower() == SUPER_ADMIN_EMAIL + + +def _super_write(user=Depends(_write)): + if not _super(user): + raise HTTPException(403, "수퍼 관리자만 자산을 삭제할 수 있습니다.") + return user + + def _store(request): store = getattr(request.app.state, "asset_store", None) if store is None: @@ -82,6 +95,7 @@ def index(request: Request): "page_title": "자산관리", "page_subtitle": "사무집기부터 컴퓨터 사양까지, 회사 자산을 한곳에서", "categories": CATEGORIES, "statuses": STATUSES, "csrf_token": request.session["asset_csrf"], "configured": getattr(request.app.state, "asset_store", None) is not None, + "can_delete": _super(user), }) @@ -179,6 +193,50 @@ def update(request: Request, asset_id: str, payload: AssetUpdate, user=Depends(_ return {"ok": True} +@router.delete("/api/assets/{asset_id}") +def delete(request: Request, asset_id: str, payload: DeleteInput, user=Depends(_super_write)): + with _errors(): + _store(request).delete(asset_id, payload.version, user["email"], payload.note) + return {"ok": True} + + +@router.post("/api/assets/{asset_id}/photos") +async def add_photo(request: Request, asset_id: str, file: Annotated[UploadFile, File()], + version: Annotated[int, Form(ge=1)], user=Depends(_write)): + filename = (file.filename or "photo.jpg").replace("\\", "/").rsplit("/", 1)[-1] + try: + if len(filename) > 200 or any(ord(c) < 32 for c in filename): + raise HTTPException(422, "사진 파일 이름을 확인하세요.") + raw = await file.read(MAX_PHOTO_BYTES + 1) + finally: + await file.close() + with _errors(): + image, mime, width, height = await run_in_threadpool(prepare_photo, raw) + photo_id = await run_in_threadpool(_store(request).add_photo, asset_id, version, user["email"], filename, image, mime, width, height) + return {"id": photo_id} + + +@router.get("/api/assets/{asset_id}/photos/{photo_id}") +def photo(request: Request, asset_id: str, photo_id: str, user=Depends(_user)): + with _errors(): + row = _store(request).photo(asset_id, photo_id) + return Response(bytes(row["image"]), media_type=row["mime"], + headers={"X-Content-Type-Options": "nosniff", "Cache-Control": "no-store"}) + + +@router.get("/api/assets/{asset_id}/reports/{report_id}/monitors") +def report_monitors(request: Request, asset_id: str, report_id: str, user=Depends(_user)): + with _errors(): + return {"items": _store(request).report_monitors(asset_id, report_id)} + + +@router.post("/api/assets/{asset_id}/monitors/{index}") +def register_monitor(request: Request, asset_id: str, index: int, payload: MonitorInput, user=Depends(_write)): + with _errors(): + monitor_id = _store(request).register_monitor(asset_id, index, payload, user["email"]) + return {"id": monitor_id} + + @router.post("/api/assets/{asset_id}/actions") def action(request: Request, asset_id: str, payload: ActionInput, user=Depends(_write)): from app.main import user_store diff --git a/app/modules/asset/store.py b/app/modules/asset/store.py index 3de1e95..c03d6e1 100644 --- a/app/modules/asset/store.py +++ b/app/modules/asset/store.py @@ -44,6 +44,28 @@ class AssetUpdate(AssetInput): version: int = Field(ge=1) +class DeleteInput(BaseModel): + model_config = ConfigDict(extra="forbid", str_strip_whitespace=True) + version: int = Field(ge=1) + note: str = Field(min_length=1, max_length=2000) + + +class MonitorInput(BaseModel): + model_config = ConfigDict(extra="forbid", str_strip_whitespace=True) + version: int = Field(ge=1) + report_id: str = Field(min_length=1, max_length=64) + asset: AssetInput | None = None + asset_id: str = Field(default="", max_length=64) + + @model_validator(mode="after") + def require_target(self): + if bool(self.asset) == bool(self.asset_id): + raise ValueError("등록할 정보 또는 연결할 모니터 자산 중 하나를 지정하세요.") + if self.asset and self.asset.category != "monitor": + raise ValueError("모니터 분류로 등록하세요.") + return self + + class ActionInput(BaseModel): model_config = ConfigDict(extra="forbid", str_strip_whitespace=True) version: int = Field(ge=1) diff --git a/app/modules/asset/templates/asset/index.html b/app/modules/asset/templates/asset/index.html index ca42597..13a8a6e 100644 --- a/app/modules/asset/templates/asset/index.html +++ b/app/modules/asset/templates/asset/index.html @@ -1,8 +1,8 @@ {% extends "erp_base.html" %} {% set force_sidebar_collapsed = true %} -{% block head_extra %}{% endblock %} +{% block head_extra %}{% endblock %} {% block content %} -
+