0313界面对接

busisness/blls.py

@@ -6,8 +6,8 @@
 from dataclasses import fields
 from typing import List, Optional, Dict, Any
 from datetime import datetime
-from busisness.models import ArtifactInfoModel, PDRecordModel
-from busisness.dals import ArtifactDal, PDRecordDal
+from busisness.models import ArtifactInfoModel, PDRecordModel,FreqRecordModel
+from busisness.dals import ArtifactDal, PDRecordDal,FreqRecordDal
 
 
 class ArtifactBll:
@@ -109,9 +109,9 @@ class PDRecordBll:
         """获取PD官片任务数据"""
         return self.dal.get_top_pd(5, "ID desc")
 
-    def get_last_pds(self,mould_code:str) -> List[PDRecordModel]:
+    def get_last_pds(self,mould_code:str,top=1) -> List[PDRecordModel]:
         """获取当前浇筑的后三片的派据（有可能其中一项为空，但需要保证第一条有记录）"""
-        return self.dal.get_last_pds(1,mould_code)
+        return self.dal.get_last_pds(top,mould_code)
 
     def insert_PD_record(self,model:PDRecordModel) -> bool:
         """保存PD官片任务(存在更新，不存在插入)"""
@@ -127,12 +127,16 @@ class PDRecordBll:
     
     def start_pd(self, code: str,volumn:float) -> bool:
         """开始管片生产"""
-        return self.dal.update_by_modulecode(code, {'Status': 2,'OptTime':datetime.now(),'FBetonVolume':volumn})    
+        return self.dal.update_by_modulecode(code, {'Status': 2,'GStatus':1,'OptTime':datetime.now(),'FBetonVolume':volumn})
     
     def update_PD_record(self,artifact_action_id: int, update_fields: dict) -> bool:
         """更新PD官片任务状态"""
         return self.dal.update_pd(artifact_action_id, update_fields)
 
+    def update_PD_record_byid(self,id: int, update_fields: dict) -> bool:
+        """更新PD官片任务状态"""
+        return self.dal.update_pd_byid(id, update_fields)
+
     def save_PD_record(self,model:PDRecordModel) -> int:
         
         """保存PD官片任务(存在ModuleCode更新，不存在插入，存在ArtifactID不处理)"""
@@ -155,13 +159,27 @@ class PDRecordBll:
                     'SizeSpecification':model.SizeSpecification,
                     'BlockNumber':model.BlockNumber,
                     'BetonVolume':model.BetonVolume,
+                    'GStatus':model.GStatus,
                     'PlannedVolume':model.PlannedVolume
                     }
                 return self.dal.update_by_modulecode(model.MouldCode, update_dict)  
         
         return 1
        
-    
+class FreqRecordBll:
+    def __init__(self):
+        """初始化数据访问层，创建数据库连接"""
+        # 假设数据库文件在db目录下
+        self.dal = FreqRecordDal()
+        pass
+
+    def get_freqs_sync(self) -> List[FreqRecordModel]:
+        """获取所有未同步的频率记录"""
+        return self.dal.get_all_sync()
+
+    def insert_freq_record(self,model:FreqRecordModel) -> int:
+        """插入一条频率记录"""
+        return self.dal.insert_record(model)
 
 if __name__ == "__main__":
     # artifact_dal = ArtifactBll()