diff --git a/API/send_data_test.py b/API/send_data_test.py index 346ab6f..9922a75 100644 --- a/API/send_data_test.py +++ b/API/send_data_test.py @@ -205,10 +205,9 @@ def get_not_pour_info(): "Code": 200, "Message": None, "Data": [ - { "ArtifactID": "QR1B12000151AD", - "ArtifactActionID": 346482967298140, + "ArtifactActionID": 346482967298136, "ArtifactIDVice1": "Q00001AD", "ProduceRingNumber": 1, "MouldCode": "SHR2B1-9", @@ -216,18 +215,50 @@ def get_not_pour_info(): "RingTypeCode": "R22", "SizeSpecification": "6900*1500", "BuriedDepth": "中埋", - "BlockNumber": "L3", + "BlockNumber": "L1", "HoleRingMarking": "否", "GroutingPipeMarking": "否", "PolypropyleneFiberMarking": "否", "BetonVolume": 1.9, "BetonTaskID": "20251020-01" }, - + { + "ArtifactID": "QR1B32000153AD", + "ArtifactActionID": 346482967298137, + "ArtifactIDVice1": "Q00001AD", + "ProduceRingNumber": 1, + "MouldCode": "SHR2B3-9", + "SkeletonID": "QR1B2000048A", + "RingTypeCode": "R22", + "SizeSpecification": "6900*1500", + "BuriedDepth": "中埋", + "BlockNumber": "L2", + "HoleRingMarking": "否", + "GroutingPipeMarking": "否", + "PolypropyleneFiberMarking": "否", + "BetonVolume": 1.9, + "BetonTaskID": "20251020-01" + }, + { + "ArtifactID": "QR1B12000151AD", + "ArtifactActionID": 346482967298138, + "ArtifactIDVice1": "Q00001AD", + "ProduceRingNumber": 1, + "MouldCode": "SHR2B1-9", + "SkeletonID": "QR1B12000046A", + "RingTypeCode": "R22", + "SizeSpecification": "6900*1500", + "BuriedDepth": "中埋", + "BlockNumber": "B3", + "HoleRingMarking": "否", + "GroutingPipeMarking": "否", + "PolypropyleneFiberMarking": "否", + "BetonVolume": 0.6, + "BetonTaskID": "20251020-01" + }, ] } - return jsonify(response_data), 200 except Exception as e: diff --git a/main.py b/main.py index e629ed1..7ab2338 100644 --- a/main.py +++ b/main.py @@ -38,8 +38,8 @@ def main(): tcp_server_thread.start() # 初始化发送数据的OPC客户端 - data_client = OPCClient(url=f'opc.tcp://{TCP_CLIENT_HOST}:{TCP_CLIENT_PORT}') - data_client.start() + # data_client = OPCClient(url=f'opc.tcp://{TCP_CLIENT_HOST}:{TCP_CLIENT_PORT}') + # data_client.start() # 等待服务端启动 time.sleep(1) @@ -159,8 +159,8 @@ def main(): if 'tcp_server' in locals(): tcp_server.stop() # 停止OPC客户端 - if 'data_client' in locals(): - data_client.stop() + # if 'data_client' in locals(): + # data_client.stop() if __name__ == "__main__": diff --git a/services/task_service.py b/services/task_service.py index e72aa6b..4daa280 100644 --- a/services/task_service.py +++ b/services/task_service.py @@ -15,8 +15,8 @@ class TaskService: self.artifact_timestamps = {} self.tcp_server = tcp_server from config.settings import TCP_CLIENT_HOST, TCP_CLIENT_PORT - self.data_client = OPCClient(url=f'opc.tcp://{TCP_CLIENT_HOST}:{TCP_CLIENT_PORT}') - self.data_client.start() + # self.data_client = OPCClient(url=f'opc.tcp://{TCP_CLIENT_HOST}:{TCP_CLIENT_PORT}') + # self.data_client.start() def process_not_pour_info(self): """处理未浇筑信息"""