From 7cd2b6d16654d5511250d99375ca9c1b61c6abd0 Mon Sep 17 00:00:00 2001
From: cp3hnu <709011834@qq.com>
Date: Wed, 23 Oct 2024 15:51:29 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E5=AE=9E=E9=AA=8C=E5=AF=B9?=
 =?UTF-8?q?=E6=AF=94=E5=88=86=E9=A1=B5=E6=9F=A5=E8=AF=A2?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../ruoyi/platform/mapper/ExperimentInsDao.java    |  3 ++-
 .../platform/service/impl/AimServiceImpl.java      | 14 ++++++++++++--
 .../managementPlatform/ExperimentInsDaoMapper.xml  | 13 +++++++++++++
 3 files changed, 27 insertions(+), 3 deletions(-)

diff --git a/ruoyi-modules/management-platform/src/main/java/com/ruoyi/platform/mapper/ExperimentInsDao.java b/ruoyi-modules/management-platform/src/main/java/com/ruoyi/platform/mapper/ExperimentInsDao.java
index 58642324..c9ef05bf 100644
--- a/ruoyi-modules/management-platform/src/main/java/com/ruoyi/platform/mapper/ExperimentInsDao.java
+++ b/ruoyi-modules/management-platform/src/main/java/com/ruoyi/platform/mapper/ExperimentInsDao.java
@@ -39,6 +39,8 @@ public interface ExperimentInsDao {
      */
     long count(@Param("experimentIns") ExperimentIns experimentIns);
 
+    long countTorE(@Param("experimentId") Integer experimentId, @Param("isTrain") Boolean isTrain);
+
     /*
       统计实验实例总数
 
@@ -100,7 +102,6 @@ public interface ExperimentInsDao {
     List<ExperimentIns> getLatestInsList();
 
 
-
     List<ExperimentIns> queryByExperiment(@Param("experimentIns") ExperimentIns experimentIns);
 
     List<ExperimentIns> queryByExperimentId(Integer id);
diff --git a/ruoyi-modules/management-platform/src/main/java/com/ruoyi/platform/service/impl/AimServiceImpl.java b/ruoyi-modules/management-platform/src/main/java/com/ruoyi/platform/service/impl/AimServiceImpl.java
index 9eba931a..b63fe369 100644
--- a/ruoyi-modules/management-platform/src/main/java/com/ruoyi/platform/service/impl/AimServiceImpl.java
+++ b/ruoyi-modules/management-platform/src/main/java/com/ruoyi/platform/service/impl/AimServiceImpl.java
@@ -157,10 +157,20 @@ public class AimServiceImpl implements AimService {
         PageRequest pageRequest = PageRequest.of(page, size);
         ExperimentIns query = new ExperimentIns();
         query.setExperimentId(experimentId);
-        long count = experimentInsDao.count(query);
+        long count = experimentInsDao.countTorE(experimentId, isTrain);
         List<ExperimentIns> experimentInsList = experimentInsDao.queryAllByLimit(query, pageRequest);
+
+        List<ExperimentIns> collect = experimentInsList.stream().filter(ins -> {
+            Map<String, Object> metricRecord = JacksonUtil.parseJSONStr2Map(ins.getMetricRecord());
+            if (isTrain) {
+                return metricRecord.get("train") != null;
+            } else {
+                return metricRecord.get("evaluate") != null;
+            }
+        }).collect(Collectors.toList());
+
         List<InsMetricInfoVo> aimRunInfoList = new ArrayList<>();
-        for (ExperimentIns experimentIns : experimentInsList) {
+        for (ExperimentIns experimentIns : collect) {
             InsMetricInfoVo aimRunInfo = new InsMetricInfoVo();
             aimRunInfo.setExperimentInsId(experimentIns.getId());
             aimRunInfo.setStartTime(experimentIns.getCreateTime());
diff --git a/ruoyi-modules/management-platform/src/main/resources/mapper/managementPlatform/ExperimentInsDaoMapper.xml b/ruoyi-modules/management-platform/src/main/resources/mapper/managementPlatform/ExperimentInsDaoMapper.xml
index ef87ed63..87d06752 100644
--- a/ruoyi-modules/management-platform/src/main/resources/mapper/managementPlatform/ExperimentInsDaoMapper.xml
+++ b/ruoyi-modules/management-platform/src/main/resources/mapper/managementPlatform/ExperimentInsDaoMapper.xml
@@ -250,6 +250,19 @@
         where experiment_id = #{id} and state = 1
     </select>
 
+    <select id="countTorE" resultType="java.lang.Long">
+        select count(1)
+        from experiment_ins
+        where state = 1
+        and experiment_id = #{experimentId}
+        <if test="isTrain">
+            and not JSON_CONTAINS(metric_record, 'null', '$.train')
+        </if>
+        <if test="! isTrain">
+            and not JSON_CONTAINS(metric_record, 'null', '$.evaluate')
+        </if>
+    </select>
+
     <!--新增所有列-->
     <insert id="insert" keyProperty="id" useGeneratedKeys="true">
         insert into experiment_ins(experiment_id,argo_ins_name,argo_ins_ns,status,nodes_status,nodes_result,nodes_logs,global_param,metric_record,metric_value,start_time,finish_time,create_by,create_time,update_by,update_time,state)