dd

python/api.py

@@ -601,17 +601,13 @@ def insertEmptyLogoList(session):
 
 @app.get("/logo_list", description="logo列表")
 def logo_list():
-    session = SqlQuery()
-    photos = CRUD(SysConfigs)
-    item = photos.read(session, conditions={"key": "logo_configs"})
-    if item == None:
-        item = insertEmptyLogoList(session)
-    session.close()
-    return {
-        "code": 0,
-        "msg": "",
-        "data": json.loads(item.value),
-    }
+    logo_dir = "{}/data/logo/".format(os.getcwd()).replace("\\", "/")
+    check_path(logo_dir)
+    logo_files = os.listdir(logo_dir)
+    logo_list = []
+    for logoItem in logo_files:
+        logo_list.append(f"{logo_dir}{logoItem}")
+    return {"code": 0, "msg": "操作成功", "data": logo_list}
 
 
 @app.post("/add_logo", description="添加logo")
@@ -622,7 +618,6 @@ def add_logo(params: LogoParams):
     item = sysConfig.read(session, conditions={"key": "logo_configs"})
     if item == None:
         item = insertEmptyLogoList(session)
-    logo_list = json.loads(item.value)
     if os.path.isfile(logo_path) == False:
         return {"code": 1, "msg": "logo文件不存在", "data": None}
     logo_dir = "{}/data/logo/".format(os.getcwd()).replace("\\", "/")
@@ -630,30 +625,26 @@ def add_logo(params: LogoParams):
     fpath, fname = os.path.split(logo_path)
     logo_path_info = logo_dir + fname
     shutil.copy(logo_path, logo_path_info)  # 复制文件
-    if len(logo_list)>0:
-        for itemInfo in logo_list:
-            if calculate_md5(logo_path_info) == calculate_md5(itemInfo):
-                continue
-            logo_list.append(logo_path_info)
-    else:
-        logo_list.append(logo_path_info)
-    data = {"key": "logo_configs", "value": json.dumps(logo_list)}
-    sysConfig.updateConditions(session, conditions={"key": "logo_configs"}, **data)
+    logo_files = os.listdir(logo_dir)
+    logo_list = []
+    for logoItem in logo_files:
+        logo_list.append(f"{logo_dir}{logoItem}")
     return {
         "code": 0,
         "msg": "",
-        "data": {"logo":logo_path_info},
+        "data": logo_list,
     }
 
 @app.post("/delete_logo", description="删除logo")
 def delete_logo(params: LogoParamsupdate):
-    # params.value = json.dumps(params.value)
-    session = SqlQuery()
-    sysConfig = CRUD(SysConfigs)
-    model = sysConfig.read(session, conditions={"key": "logo_configs"})
-    if model == None:
-        insertEmptyLogoList(session)
-    # 走编辑逻辑
-    kwargs = params.__dict__
-    save_device_config = sysConfig.updateConditions(session, conditions={"key": "logo_configs"}, **kwargs)
-    return {"code": 0, "msg": "操作成功", "data": save_device_config}
+    logo_path = params.path
+    if os.path.isfile(logo_path) == False:
+        return {"code": 1, "msg": "logo文件不存在", "data": None}
+    os.remove(logo_path)
+    logo_dir = "{}/data/logo/".format(os.getcwd()).replace("\\", "/")
+    check_path(logo_dir)
+    logo_files = os.listdir(logo_dir)
+    logo_list = []
+    for logoItem in logo_files:
+        logo_list.append(f"{logo_dir}{logoItem}")
+    return {"code": 0, "msg": "操作成功", "data": logo_list}

python/models.py

@@ -97,4 +97,4 @@ class LogoParams(BaseModel):
     
 class LogoParamsupdate(BaseModel):
     """系统配置"""
-    value: str = Field(default=None, description="json数据")
+    path: str = Field(default=None, description="要删除得文件路径")