From 71d49477127de24be659aece21ac2265093fa611 Mon Sep 17 00:00:00 2001
From: haoliang <821644@qq.com>
Date: Wed, 13 May 2026 12:32:23 +0800
Subject: [PATCH] =?UTF-8?q?feat(=E5=90=8E=E7=AB=AF):=20CollectAnalysisRepo?=
 =?UTF-8?q?sitory=E6=96=B0=E5=A2=9E=E6=8C=89=E6=9C=BA=E5=BA=8A+=E6=97=A5?=
 =?UTF-8?q?=E6=9C=9F=E6=9F=A5=E8=AF=A2=E9=87=87=E9=9B=86=E8=AE=B0=E5=BD=95?=
 =?UTF-8?q?=E6=96=B9=E6=B3=95=EF=BC=88T7=E6=95=B0=E6=8D=AE=E6=BA=90?=
 =?UTF-8?q?=E5=88=87=E6=8D=A2=EF=BC=89?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../Impl/Log/CollectAnalysisRepository.cs     | 19 +++++++++++++++++++
 .../Interface/ICollectAnalysisRepository.cs   |  3 +++
 2 files changed, 22 insertions(+)

diff --git a/src/CncRepository/Impl/Log/CollectAnalysisRepository.cs b/src/CncRepository/Impl/Log/CollectAnalysisRepository.cs
index 543d539..0a3de53 100644
--- a/src/CncRepository/Impl/Log/CollectAnalysisRepository.cs
+++ b/src/CncRepository/Impl/Log/CollectAnalysisRepository.cs
@@ -5,6 +5,7 @@ using Dapper;
 using MySqlConnector;
 using CncModels.Dto;
 using CncModels.Dto.CollectLog;
+using CncModels.Dto.Machine;
 using CncModels.Entity;
 using CncRepository.Base;
 using CncRepository.Interface;
@@ -184,5 +185,23 @@ namespace CncRepository.Impl.Log
                     new { Date = date });
             }
         }
+
+        /// <summary>按机床ID和日期查询采集分析记录</summary>
+        public List<MachineCollectRecordItem> GetRecordsByMachineAndDate(int machineId, DateTime date)
+        {
+            using (var conn = CreateConnection())
+            {
+                var sql = @"
+                    SELECT DATE_FORMAT(analysis_time, '%Y-%m-%d %H:%i:%s') AS CollectTime,
+                           current_program AS ProgramName,
+                           current_part_count AS PartCount,
+                           current_status AS RunStatus
+                    FROM log_collect_analysis
+                    WHERE machine_id = @MachineId AND DATE(analysis_time) = @Date
+                    ORDER BY analysis_time DESC";
+                return conn.Query<MachineCollectRecordItem>(sql,
+                    new { MachineId = machineId, Date = date }).AsList();
+            }
+        }
     }
 }
diff --git a/src/CncRepository/Interface/ICollectAnalysisRepository.cs b/src/CncRepository/Interface/ICollectAnalysisRepository.cs
index 42b6086..f8524a5 100644
--- a/src/CncRepository/Interface/ICollectAnalysisRepository.cs
+++ b/src/CncRepository/Interface/ICollectAnalysisRepository.cs
@@ -2,6 +2,7 @@ using System;
 using System.Collections.Generic;
 using CncModels.Dto;
 using CncModels.Dto.CollectLog;
+using CncModels.Dto.Machine;
 using CncModels.Entity;
 
 namespace CncRepository.Interface
@@ -16,5 +17,7 @@ namespace CncRepository.Interface
         List<CollectAnalysisListItem> GetAnalysisByRawLogId(long rawLogId);
         long Create(CollectAnalysis entity);
         int DeleteBeforeDate(DateTime date);
+        /// <summary>按机床ID和日期查询采集分析记录</summary>
+        List<MachineCollectRecordItem> GetRecordsByMachineAndDate(int machineId, DateTime date);
     }
 }