admin/railway_cloud
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

数据查询完善

Browse Source
This commit is contained in:
lhx
2025-09-29 17:27:45 +08:00
parent 8fe42e6fdd
commit 08faa06611
9 changed files with 29 additions and 34 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
app/api/comprehensive_data.py
View File

@@ -224,12 +224,11 @@ def get_original(request: OriginalDataQueryRequest, db: Session = Depends(get_db
bfpl=request.bfpl
)
logger.info(f"Found level and original data: {result['summary']}")
return DataResponse(
success=result["success"],
message=result["message"],
count=result["count"],
data=[result["data"]]
data=result["data"]
)
except Exception as e:

2
app/models/account.py
View File

@@ -13,4 +13,4 @@ class Account(Base):
project_name = Column(String(1000), comment="项目名称")
created_at = Column(DateTime, server_default=func.now(), comment="创建时间")
updated_at = Column(DateTime, server_default=func.now(), onupdate=func.now(), comment="更新时间")
update_time = Column(String(1000), comment="更新时间跨度")
update_time = Column(String(1000), nullable=False, comment="更新时间跨度")

6
app/models/level_data.py
View File

@@ -1,7 +1,5 @@
from sqlalchemy import Column, Integer, String
from typing import List
from ..core.database import Base
from .original_data import OriginalData
class LevelData(Base):
__tablename__ = "level_data"
@@ -11,6 +9,4 @@ class LevelData(Base):
benchmarkids = Column(String(100), comment="工作基点名称序列")
wsphigh = Column(String(100), comment="工作基点高程序列(m)")
NYID = Column(String(100), nullable=False, comment="期数id", index=True)
createDate = Column(String(100), comment="上传时间")
originalDatas = List[OriginalData] = []
createDate = Column(String(100), comment="上传时间")

6
app/models/section_data.py
View File

@@ -1,7 +1,5 @@
from sqlalchemy import Column, Integer, String
from typing import List
from ..core.database import Base
from .checkpoint import Checkpoint
class SectionData(Base):
__tablename__ = "section_data"
@@ -14,6 +12,4 @@ class SectionData(Base):
status = Column(String(100), nullable=False, comment="断面状态")
number = Column(String(100), nullable=False, comment="所在桥梁墩(台)编号", index=True)
transition_paragraph = Column(String(100), comment="过渡段")
section_id = Column(String(100), nullable=False, comment="断面id", index=True)
Checkpoints = List[Checkpoint]
section_id = Column(String(100), nullable=False, comment="断面id", index=True)

6
app/schemas/account.py
View File

@@ -8,6 +8,7 @@ class AccountBase(BaseModel):
status: Optional[int] = 1
today_updated: Optional[int] = 0
project_name: Optional[str] = None
update_time: Optional[str] = None
class AccountCreate(AccountBase):
pass
@@ -18,6 +19,7 @@ class AccountUpdate(BaseModel):
status: Optional[int] = None
today_updated: Optional[int] = None
project_name: Optional[str] = None
update_time: Optional[str] = None
class AccountResponse(AccountBase):
account_id: int
@@ -39,7 +41,8 @@ class AccountResponse(AccountBase):
today_updated=account.today_updated,
project_name=account.project_name,
created_at=account.created_at,
updated_at=account.updated_at
updated_at=account.updated_at,
update_time=account.update_time
)
class AccountListRequest(BaseModel):
@@ -52,6 +55,7 @@ class AccountGetRequest(BaseModel):
project_name: Optional[str] = None
status: Optional[int] = None
today_updated: Optional[int] = None
update_time: Optional[str] = None
class AccountUpdateRequest(BaseModel):
account_id: int

3
app/schemas/comprehensive_data.py
View File

@@ -63,6 +63,7 @@ class SectionDataImportRequest(BaseModel):
# 原始数据查询请求
class OriginalDataQueryRequest(BaseModel):
linecode: Optional[str] = None
id: Optional[int] = None
bfpcode: Optional[str] = None
mtime: Optional[str] = None
@@ -99,7 +100,7 @@ class SettlementDataQueryRequest(BaseModel):
# 断面数据导入请求
class SectionDataQueryRequest(BaseModel):
id: Optional[int] = None
section_id: str
section_id: Optional[int] = None
mileage: Optional[str] = None
work_site: Optional[str] = None
status: Optional[str] = None

2
app/services/base.py
View File

@@ -59,7 +59,7 @@ class BaseService(Generic[ModelType]):
if hasattr(self.model, field_name) and field_value is not None:
field = getattr(self.model, field_name)
if isinstance(field_value, str):
query = query.filter(field.like(f"%{field_value}%"))
query = query.filter(field.like(f"{field_value}"))
else:
query = query.filter(field == field_value)
return query.all()

3
app/services/level_data.py
View File

@@ -32,8 +32,7 @@ class LevelDataService(BaseService[LevelData]):
if id is not None:
conditions["id"] = id
level_data = self.search_by_conditions(db, conditions)
# 查询原始数据
return self.search_by_conditions(db, conditions)
def get_by_nyid_and_linecode(self, db: Session, nyid: str, linecode: str = None) -> Optional[LevelData]:

32
app/utils/scheduler.py
View File

@@ -82,22 +82,22 @@ class TaskScheduler:
logger.error(f"设置系统定时任务失败: {e}")
# 设置测试任务
try:
existing_job = self.scheduler.get_job("test_task")
if not existing_job:
# 添加每天每小时重置today_updated字段的任务
self.scheduler.add_job(
reset_today_updated_task,
'cron',
id='test_task',
hour='*',
minute=0,
second=0,
name='测试任务'
)
logger.info("系统定时任务：测试任务已添加")
except Exception as e:
logger.error(f"设置测试任务失败: {e}")
# try:
# existing_job = self.scheduler.get_job("test_task")
# if not existing_job:
# # 添加每天每小时重置today_updated字段的任务
# self.scheduler.add_job(
# reset_today_updated_task,
# 'cron',
# id='test_task',
# hour='*',
# minute=0,
# second=0,
# name='测试任务'
# )
# logger.info("系统定时任务：测试任务已添加")
# except Exception as e:
# logger.error(f"设置测试任务失败: {e}")
def add_cron_job(self, func, job_id: str, **kwargs):
"""添加cron定时任务"""