完善显示用户农场图片，优化部分JSON
This commit is contained in:
+173
-11
@@ -1,10 +1,12 @@
|
||||
import os
|
||||
from io import StringIO
|
||||
from typing import Any, List, Optional
|
||||
|
||||
import aiosqlite
|
||||
|
||||
from zhenxun.services.log import logger
|
||||
|
||||
from .config import CJsonManager, g_sDBFilePath, g_sDBPath
|
||||
from .config import g_pJsonManager, g_sDBFilePath, g_sDBPath
|
||||
|
||||
|
||||
class CSqlManager:
|
||||
@@ -31,27 +33,100 @@ class CSqlManager:
|
||||
|
||||
@classmethod
|
||||
async def createDB(cls) -> bool:
|
||||
"""初始化数据库表
|
||||
"""初始化数据库用户信息表
|
||||
|
||||
Returns:
|
||||
bool: 是否创建成功
|
||||
"""
|
||||
|
||||
#用户信息
|
||||
userInfo = """
|
||||
CREATE TABLE user (
|
||||
uid INTEGER PRIMARY KEY AUTOINCREMENT,
|
||||
name TEXT NOT NULL,
|
||||
exp INTEGER DEFAULT 0,
|
||||
point INTEGER DEFAULT 0
|
||||
);
|
||||
"""
|
||||
|
||||
#用户仓库
|
||||
userStorehouse = """
|
||||
CREATE TABLE storehouse (
|
||||
uid INTEGER PRIMARY KEY AUTOINCREMENT,
|
||||
item TEXT DEFAULT '',
|
||||
plant TEXT DEFAULT ''
|
||||
);
|
||||
"""
|
||||
|
||||
#用户土地信息
|
||||
with StringIO() as buffer:
|
||||
buffer.write("CREATE TABLE soil (")
|
||||
buffer.write("uid INTEGER PRIMARY KEY AUTOINCREMENT,")
|
||||
|
||||
fields = [f"soil{i} TEXT DEFAULT ''" for i in range(1, 31)]
|
||||
buffer.write(",\n".join(fields))
|
||||
|
||||
buffer.write(");")
|
||||
|
||||
userSoilInfo = buffer.getvalue()
|
||||
|
||||
if not await cls.executeDB(userInfo):
|
||||
return False
|
||||
|
||||
if not await cls.executeDB(userStorehouse):
|
||||
return False
|
||||
|
||||
if not await cls.executeDB(userSoilInfo):
|
||||
return False
|
||||
|
||||
return True
|
||||
|
||||
@classmethod
|
||||
async def executeDB(cls, command: str) -> bool:
|
||||
"""执行自定义SQL
|
||||
|
||||
Args:
|
||||
command (str): SQL语句
|
||||
|
||||
Returns:
|
||||
bool: 是否执行成功
|
||||
"""
|
||||
|
||||
if len(command) <= 0:
|
||||
logger.warning("数据库语句长度不能！")
|
||||
return False
|
||||
|
||||
try:
|
||||
await cls.m_pDB.execute("""
|
||||
CREATE TABLE user (
|
||||
uid INTEGER PRIMARY KEY AUTOINCREMENT,
|
||||
name TEXT NOT NULL,
|
||||
exp INTEGER DEFAULT 0,
|
||||
point INTEGER DEFAULT 0
|
||||
);
|
||||
""")
|
||||
await cls.m_pDB.execute(command)
|
||||
await cls.m_pDB.commit()
|
||||
return True
|
||||
except Exception as e:
|
||||
print(f"An error occurred: {e}")
|
||||
logger.warning("数据库语句执行出错：" + command)
|
||||
return False
|
||||
|
||||
@classmethod
|
||||
async def executeDBCursor(cls, command: str) -> Optional[List[Any]]:
|
||||
"""执行自定义SQL并返回查询结果
|
||||
|
||||
Args:
|
||||
command (str): SQL查询语句
|
||||
|
||||
Returns:
|
||||
Optional[List[Any]]: 查询结果列表（成功时），None（失败时）
|
||||
"""
|
||||
if len(command) <= 0:
|
||||
logger.warning("空数据库命令")
|
||||
return None
|
||||
|
||||
try:
|
||||
async with cls.m_pDB.execute(command) as cursor:
|
||||
# 将Row对象转换为字典列表
|
||||
results = [dict(row) for row in await cursor.fetchall()]
|
||||
return results
|
||||
except Exception as e:
|
||||
logger.error(f"数据库执行失败: {e}")
|
||||
return None
|
||||
|
||||
@classmethod
|
||||
async def getUserInfoByUid(cls, uid: str) -> list[dict]:
|
||||
"""根据用户Uid获取用户信息
|
||||
@@ -108,6 +183,40 @@ class CSqlManager:
|
||||
logger.warning(f"查询失败: {e}")
|
||||
return -1
|
||||
|
||||
@classmethod
|
||||
async def updateUserPointByUid(cls, uid: str, point: int) -> int:
|
||||
"""根据用户Uid修改用户农场币
|
||||
|
||||
Args:
|
||||
uid (str): 用户Uid
|
||||
point (int): 要更新的新农场币数量（需 ≥ 0）
|
||||
|
||||
Returns:
|
||||
int: 更新后的农场币数量（成功时），-1（失败时）
|
||||
"""
|
||||
|
||||
if len(uid) <= 0:
|
||||
logger.warning("参数校验失败: uid为空或农场币值无效")
|
||||
return -1
|
||||
|
||||
try:
|
||||
async with cls.m_pDB.execute(
|
||||
"""UPDATE user
|
||||
SET point = ?
|
||||
WHERE uid = ?
|
||||
RETURNING point""",
|
||||
(point, uid)
|
||||
) as cursor:
|
||||
async for row in cursor:
|
||||
return int(row[0])
|
||||
|
||||
logger.info(f"未找到用户或未修改数据: uid={uid}")
|
||||
return -1
|
||||
except Exception as e:
|
||||
# 记录详细错误日志（建议记录堆栈）
|
||||
logger.error(f"更新失败: {e}")
|
||||
return -1
|
||||
|
||||
@classmethod
|
||||
async def getUserLevelByUid(cls, uid: str) -> int:
|
||||
"""根据用户Uid获取用户等级
|
||||
@@ -135,6 +244,8 @@ class CSqlManager:
|
||||
for key in sorted_keys:
|
||||
if exp >= levelDict[key]:
|
||||
return int(key)
|
||||
|
||||
return -1
|
||||
except Exception as e:
|
||||
logger.warning(f"查询失败: {e}")
|
||||
return -1
|
||||
@@ -188,4 +299,55 @@ class CSqlManager:
|
||||
logger.warning(f"添加失败: {e}")
|
||||
return False
|
||||
|
||||
# @classmethod
|
||||
# async def getUserStorehousePlant(cls, info: list[dict]) -> str:
|
||||
# """获取用户仓库种子信息
|
||||
|
||||
# Args:
|
||||
# info (list[dict]): 用户信息
|
||||
|
||||
# Returns:
|
||||
# str: 仓库种子信息
|
||||
# """
|
||||
|
||||
# try:
|
||||
# await cls.m_pDB.execute(
|
||||
# """
|
||||
# INSERT INTO user (uid, name, exp, point) VALUES (?, ?, ?, ?)
|
||||
# """,
|
||||
# (info["uid"], info["name"], info["exp"], info["point"]),
|
||||
# )
|
||||
# await cls.m_pDB.commit()
|
||||
|
||||
# return True
|
||||
# except Exception as e:
|
||||
# logger.warning(f"添加失败: {e}")
|
||||
# return False
|
||||
|
||||
# @classmethod
|
||||
# async def appendUserByUserInfo(cls, info: list[dict]) -> bool:
|
||||
# """添加用户信息
|
||||
|
||||
# Args:
|
||||
# info (list[dict]): 用户信息
|
||||
|
||||
# Returns:
|
||||
# bool: 是否添加成功
|
||||
# """
|
||||
|
||||
# try:
|
||||
# await cls.m_pDB.execute(
|
||||
# """
|
||||
# INSERT INTO user (uid, name, exp, point) VALUES (?, ?, ?, ?)
|
||||
# """,
|
||||
# (info["uid"], info["name"], info["exp"], info["point"]),
|
||||
# )
|
||||
# await cls.m_pDB.commit()
|
||||
|
||||
# return True
|
||||
# except Exception as e:
|
||||
# logger.warning(f"添加失败: {e}")
|
||||
# return False
|
||||
|
||||
|
||||
g_pSqlManager = CSqlManager()
|
||||
|
||||
Reference in New Issue
Block a user