From c118339e1b0677bd3d461dc696d430778dbdcfb4 Mon Sep 17 00:00:00 2001 From: shoulinwei Date: Fri, 22 Apr 2022 23:04:53 +0800 Subject: [PATCH] new id --- csst_dfs_commons/models/common.py | 2 ++ csst_dfs_commons/models/facility.py | 8 ++++---- 2 files changed, 6 insertions(+), 4 deletions(-) diff --git a/csst_dfs_commons/models/common.py b/csst_dfs_commons/models/common.py index 64ca1ac..84e5e62 100644 --- a/csst_dfs_commons/models/common.py +++ b/csst_dfs_commons/models/common.py @@ -21,6 +21,8 @@ class BaseModel: return self def from_proto_model(self, record): + if record is None: + return None for k in self.__dataclass_fields__.keys(): self.__setattr__(k, record.__getattribute__(k)) return self diff --git a/csst_dfs_commons/models/facility.py b/csst_dfs_commons/models/facility.py index 2605986..ce1aa86 100644 --- a/csst_dfs_commons/models/facility.py +++ b/csst_dfs_commons/models/facility.py @@ -39,21 +39,21 @@ class DetectorStatus(BaseModel): @dataclasses.dataclass class Brick(BaseModel): - id: int = 0 + id: int = -1 ra: float = 0.0 dec: float = 0.0 boundingbox: str="" @dataclasses.dataclass class BrickObsStatus(BaseModel): - brick_id: int = 0 + brick_id: int = -1 band: str="" cover_num: int = 0 update_time: str="" @dataclasses.dataclass class BrickLevel1(BaseModel): - brick_id: int = 0 + brick_id: int = -1 level1_id: int = 0 obs_id: str="" module: str="" @@ -83,7 +83,7 @@ class Level2ProducerRuning(BaseModel): id: int = 0 job_id: int = 0 producer_id: int = 0 - brick_id: int = 0 + brick_id: int = -1 start_time: str="" end_time: str="" prc_status: int = 0 -- GitLab