From 74f55db1acd945f4860b2d0b4bae48e2b918b32b Mon Sep 17 00:00:00 2001
From: yeg <1347747024@qq.com>
Date: 星期三, 02 九月 2026 11:30:30 +0800
Subject: [PATCH] 移除接收区间补采与完整性旧链路

---
 ruoyi-system/src/main/resources/mapper/system/TTestMapper.xml |  307 +-------------------------------------------------
 1 files changed, 11 insertions(+), 296 deletions(-)

diff --git a/ruoyi-system/src/main/resources/mapper/system/TTestMapper.xml b/ruoyi-system/src/main/resources/mapper/system/TTestMapper.xml
index 4ba5d0a..d3b21e5 100644
--- a/ruoyi-system/src/main/resources/mapper/system/TTestMapper.xml
+++ b/ruoyi-system/src/main/resources/mapper/system/TTestMapper.xml
@@ -19,9 +19,6 @@
         <result property="startedAtUtc" column="started_at_utc" />
         <result property="endedAtUtc" column="ended_at_utc" />
         <result property="runtimeAttach" column="runtime_attach" />
-        <result property="backfillStatus" column="backfill_status" />
-        <result property="backfillStartedAtUtc" column="backfill_started_at_utc" />
-        <result property="backfillCompletedAtUtc" column="backfill_completed_at_utc" />
         <result property="delFlag" column="del_flag" />
         <result property="createBy" column="create_by" />
         <result property="createTime" column="create_time" />
@@ -114,54 +111,18 @@
         <result property="exceptionInfo" column="exception_info" />
         <result property="delFlag" column="del_flag" />
     </resultMap>
-    <resultMap id="TTestCollectorExceptionIntervalResultMap" type="TTestCollectorExceptionInterval">
-        <id property="intervalId" column="interval_id" />
-        <result property="testId" column="test_id" />
-        <result property="batteryRelationId" column="battery_relation_id" />
-        <result property="collectorId" column="collector_id" />
-        <result property="collectorCode" column="collector_code" />
-        <result property="collectorName" column="collector_name" />
-        <result property="collectorChannelCode" column="collector_channel_code" />
-        <result property="measurementName" column="measurement_name" />
-        <result property="exceptionType" column="exception_type" />
-        <result property="openedAtUtc" column="opened_at_utc" />
-        <result property="missingFromUtc" column="missing_from_utc" />
-        <result property="recoveredAtUtc" column="recovered_at_utc" />
-        <result property="missingToUtc" column="missing_to_utc" />
-        <result property="intervalStatus" column="interval_status" />
-        <result property="detail" column="detail" />
-    </resultMap>
-    <resultMap id="TTestReceptionIntervalResultMap" type="TTestReceptionInterval">
-        <id property="intervalId" column="interval_id" />
-        <result property="testId" column="test_id" />
-        <result property="bindingId" column="binding_id" />
-        <result property="sourceType" column="source_type" />
-        <result property="sourceId" column="source_id" />
-        <result property="sourceChannelCode" column="source_channel_code" />
-        <result property="actionAtUtc" column="action_at_utc" />
-        <result property="startBoundaryAtUtc" column="start_boundary_at_utc" />
-        <result property="endBoundaryAtUtc" column="end_boundary_at_utc" />
-        <result property="boundaryNote" column="boundary_note" />
-        <result property="intervalStatus" column="interval_status" />
-    </resultMap>
 
     <sql id="selectTestBase">
         select t.test_id, t.test_name, t.creator_id, creator.nick_name creator_name,
                t.principal_id, principal.nick_name principal_name,
                t.test_type_id, ty.test_type_name, t.test_purpose,
-               case when t.test_status = 'RUNNING'
-                         and exists (select 1 from t_test_collector_exception_interval exception_fact
-                                     where exception_fact.test_id = t.test_id
-                                       and exception_fact.interval_status = 'OPEN')
-                    then 'RUNNING_ABNORMAL'
-                    else t.test_status end test_status,
+               t.test_status,
                t.reception_status, t.monitor_timeout_minutes,
                t.started_at_utc, t.ended_at_utc, t.del_flag,
                t.create_by, t.create_time, t.update_by, t.update_time, t.remark,
                cast(t.logic_step_mappings_json as char) logic_step_mappings_json,
                (select count(1) from t_test_battery b where b.test_id = t.test_id and b.del_flag = 0) battery_count,
-               t.runtime_attach runtime_attach, t.backfill_status, t.backfill_started_at_utc,
-               t.backfill_completed_at_utc
+               t.runtime_attach runtime_attach
         from t_test t
         left join sys_user creator on creator.user_id = t.creator_id and creator.del_flag = '0'
         left join sys_user principal on principal.user_id = t.principal_id and principal.del_flag = '0'
@@ -178,12 +139,7 @@
             <if test="batteryNo != null and batteryNo != ''">and exists (select 1 from t_test_battery fb where fb.test_id = t.test_id and fb.battery_no = #{batteryNo} and fb.del_flag = 0)</if>
             <if test="testStatus != null and testStatus != ''">
                 and (
-                    (#{testStatus} = 'RUNNING_ABNORMAL' and t.test_status = 'RUNNING'
-                        and exists (select 1 from t_test_collector_exception_interval exception_fact
-                                    where exception_fact.test_id = t.test_id and exception_fact.interval_status = 'OPEN'))
-                    or (#{testStatus} = 'RUNNING' and t.test_status = 'RUNNING'
-                        and not exists (select 1 from t_test_collector_exception_interval exception_fact
-                                        where exception_fact.test_id = t.test_id and exception_fact.interval_status = 'OPEN'))
+                    (#{testStatus} = 'RUNNING' and t.test_status = 'RUNNING')
                     or (#{testStatus} = 'COMPLETED' and t.test_status in ('COMPLETED', 'COMPLETION_PENDING', 'TERMINATED'))
                     or (#{testStatus} not in ('RUNNING', 'RUNNING_ABNORMAL', 'COMPLETED') and t.test_status = #{testStatus})
                 )
@@ -359,13 +315,6 @@
     <select id="selectTestThresholds" parameterType="Long" resultMap="TTestThresholdResultMap">
         select threshold_id, test_id, metric_code, min_value, max_value, unit, severity, del_flag
         from t_test_warning_threshold where test_id = #{testId} and del_flag = 0 order by threshold_id
-    </select>
-    <select id="selectTestReceptionIntervals" parameterType="Long" resultMap="TTestReceptionIntervalResultMap">
-        select interval_id, test_id, binding_id, source_type, source_id, source_channel_code,
-               action_at_utc, start_boundary_at_utc, end_boundary_at_utc, boundary_note, interval_status
-        from t_test_reception_interval
-        where test_id = #{testId}
-        order by source_type, source_id, source_channel_code, start_boundary_at_utc, interval_id
     </select>
     <select id="selectReceivingTestIds" resultType="long">
         select test_id from t_test where del_flag = 0 and reception_status = 'RECEIVING' order by test_id
@@ -547,90 +496,21 @@
         for update
     </select>
 
-    <select id="selectTestsForNaturalEnd" resultMap="TTestResultMap">
-        <include refid="selectTestBase" />
-        where t.del_flag = 0 and t.reception_status in ('RECEIVING', 'PAUSED')
-        order by t.test_id
-    </select>
-    <select id="selectTestsForBackfill" resultMap="TTestResultMap">
-        <include refid="selectTestBase" />
-        where t.del_flag = 0 and t.reception_status = 'ENDED'
-          and t.test_status in ('COMPLETION_PENDING', 'COMPLETED')
-          and coalesce(t.backfill_status, 'NOT_STARTED') &lt;&gt; 'COMPLETED'
-        order by t.ended_at_utc, t.test_id
-    </select>
-    <resultMap id="TTestBackfillCursorResultMap" type="com.ruoyi.system.domain.TTestBackfillCursor">
-        <id property="cursorId" column="cursor_id" />
-        <result property="testId" column="test_id" />
-        <result property="bindingId" column="binding_id" />
-        <result property="sourceType" column="source_type" />
-        <result property="sourceId" column="source_id" />
-        <result property="sourceChannelCode" column="source_channel_code" />
-        <result property="protocolTestId" column="protocol_test_id" />
-        <result property="nextPosition" column="next_position" />
-        <result property="sourceStatus" column="source_status" />
-        <result property="protocolMetadata" column="protocol_metadata" />
-        <result property="lastError" column="last_error" />
-        <result property="updatedAtUtc" column="updated_at_utc" />
-    </resultMap>
-    <select id="selectBackfillCursorForUpdate" resultMap="TTestBackfillCursorResultMap">
-        select * from t_test_backfill_cursor
-        where test_id = #{testId} and binding_id = #{bindingId}
-          and source_type = #{sourceType} and source_id = #{sourceId}
-          and (source_channel_code = #{sourceChannelCode} or (source_channel_code is null and #{sourceChannelCode} is null))
-        for update
-    </select>
-    <insert id="insertBackfillCursor" parameterType="com.ruoyi.system.domain.TTestBackfillCursor" useGeneratedKeys="true" keyProperty="cursorId">
-        insert into t_test_backfill_cursor
-        (test_id, binding_id, source_type, source_id, source_channel_code, protocol_test_id,
-         next_position, source_status, protocol_metadata, last_error, updated_at_utc)
-        values (#{testId}, #{bindingId}, #{sourceType}, #{sourceId}, #{sourceChannelCode}, #{protocolTestId},
-                #{nextPosition}, #{sourceStatus}, cast(#{protocolMetadata} as json), #{lastError}, #{updatedAtUtc})
-    </insert>
-    <update id="updateBackfillCursor" parameterType="com.ruoyi.system.domain.TTestBackfillCursor">
-        update t_test_backfill_cursor set protocol_test_id = #{protocolTestId}, next_position = #{nextPosition},
-            source_status = #{sourceStatus}, protocol_metadata = cast(#{protocolMetadata} as json),
-            last_error = #{lastError}, updated_at_utc = #{updatedAtUtc}
-        where cursor_id = #{cursorId}
-    </update>
-    <update id="updateTestBackfillStarted">
-        update t_test set test_status = 'COMPLETION_PENDING', backfill_status = 'RUNNING',
-            backfill_started_at_utc = coalesce(backfill_started_at_utc, #{updatedAtUtc}),
-            update_time = #{updatedAtUtc} where test_id = #{testId} and reception_status = 'ENDED'
-    </update>
-    <update id="updateTestBackfillWaiting">
-        update t_test set backfill_status = 'WAITING', update_time = #{updatedAtUtc}, remark = #{error}
-        where test_id = #{testId} and reception_status = 'ENDED'
-    </update>
-    <update id="updateTestBackfillCompleted">
-        update t_test set backfill_status = 'COMPLETED', backfill_completed_at_utc = #{updatedAtUtc},
-            update_time = #{updatedAtUtc} where test_id = #{testId} and reception_status = 'ENDED'
-    </update>
     <update id="updateTestCompleted">
-        update t_test set test_status = 'COMPLETED', backfill_status = 'COMPLETED',
-            backfill_completed_at_utc = #{updatedAtUtc}, update_time = #{updatedAtUtc}
+        update t_test set test_status = 'COMPLETED', update_time = #{updatedAtUtc}
         where test_id = #{testId} and reception_status = 'ENDED' and test_status = 'COMPLETION_PENDING'
     </update>
-    <update id="updateTestNaturallyEnded">
-        update t_test set test_status = 'COMPLETION_PENDING', reception_status = 'ENDED',
-            ended_at_utc = #{endedAtUtc}, backfill_status = 'NOT_STARTED', update_time = #{endedAtUtc}
-        where test_id = #{testId} and reception_status in ('RECEIVING', 'PAUSED')
-    </update>
-    <select id="selectSampleContentHash" resultType="string">
+    <select id="selectBtsSampleContentHash" resultType="string">
         select hex(content_sha256) from t_test_sample
         where channel_id = #{channelId} and bts_test_id = #{btsTestId} and seq_id = #{sequenceId}
-    </select>
-    <select id="selectTestSampleContentHash" resultType="string">
-        select hex(content_sha256) from t_test_sample
-        where test_id = #{testId} and channel_id = #{channelId} and seq_id = #{sequenceId}
         order by sample_id limit 1
     </select>
     <insert id="insertBtsSample">
         insert ignore into t_test_sample
-        (test_id, binding_id, channel_id, reception_interval_id, bts_test_id, seq_id, device_time_utc,
+        (test_id, binding_id, channel_id, bts_test_id, seq_id, device_time_utc,
          device_time_raw, received_at_utc, cycle_no, step_no, step_type, step_name, test_time_ms, voltage_v,
          current_a, capacity_ah, energy_wh, content_sha256)
-        values (#{testId}, #{bindingId}, #{channelId}, #{intervalId}, #{btsTestId}, #{sequenceId}, #{deviceTimeUtc},
+        values (#{testId}, #{bindingId}, #{channelId}, #{btsTestId}, #{sequenceId}, #{deviceTimeUtc},
                 #{deviceTimeRaw}, #{receivedAtUtc}, #{cycleNo}, #{stepNo}, #{stepType}, #{stepName}, #{testTimeMs}, #{voltageV},
                 #{currentA}, #{capacityAh}, #{energyWh}, #{contentSha256})
     </insert>
@@ -645,88 +525,11 @@
     </select>
     <insert id="insertCollectorSample">
         insert ignore into t_test_collector_sample
-        (test_id, binding_id, reception_interval_id, collector_id, collector_channel_code, sequence_id, device_time_utc,
+        (test_id, binding_id, collector_id, collector_channel_code, sequence_id, device_time_utc,
          device_time_raw, server_received_at_utc, metric_code, metric_value, unit, content_sha256)
-        values (#{testId}, #{bindingId}, #{intervalId}, #{collectorId}, #{channelCode}, #{sequenceId}, #{deviceTimeUtc},
+        values (#{testId}, #{bindingId}, #{collectorId}, #{channelCode}, #{sequenceId}, #{deviceTimeUtc},
                 #{deviceTimeRaw}, #{receivedAtUtc}, #{metricCode}, #{metricValue}, #{unit}, #{contentSha256})
     </insert>
-    <resultMap id="TTestIntegrityIssueResultMap" type="com.ruoyi.system.domain.TTestIntegrityIssue">
-        <id property="issueId" column="issue_id"/><result property="testId" column="test_id"/>
-        <result property="intervalId" column="interval_id"/><result property="bindingId" column="binding_id"/>
-        <result property="sourceType" column="source_type"/><result property="sourceId" column="source_id"/>
-        <result property="sourceChannelCode" column="source_channel_code"/><result property="issueType" column="issue_type"/>
-        <result property="issueStatus" column="issue_status"/><result property="missingFromSequence" column="missing_from_sequence"/>
-        <result property="missingToSequence" column="missing_to_sequence"/><result property="retryCount" column="retry_count"/>
-        <result property="detail" column="detail"/><result property="firstDetectedAtUtc" column="first_detected_at_utc"/>
-        <result property="lastDetectedAtUtc" column="last_detected_at_utc"/><result property="resolvedAtUtc" column="resolved_at_utc"/>
-    </resultMap>
-    <select id="selectIntegrityIssues" resultMap="TTestIntegrityIssueResultMap">
-        select * from t_test_integrity_issue where test_id = #{testId}
-        order by issue_status, last_detected_at_utc desc, issue_id desc
-    </select>
-    <select id="selectTestExceptionFacts" resultMap="TTestIntegrityIssueResultMap">
-        select exception_id issue_id, test_id, null interval_id, null binding_id,
-               case when channel_id is null then 'UNKNOWN_SOURCE' else 'CABINET_CHANNEL' end source_type,
-               channel_id source_id, null source_channel_code, exception_type issue_type,
-               exception_status issue_status, null missing_from_sequence, null missing_to_sequence,
-               occurrence_count retry_count, detail, first_occurred_at_utc first_detected_at_utc,
-               last_occurred_at_utc last_detected_at_utc, handled_at_utc resolved_at_utc
-        from t_test_exception where test_id = #{testId}
-        order by exception_status, last_occurred_at_utc desc, exception_id desc
-    </select>
-    <select id="selectBtsSequencesByInterval" resultType="long">
-        select seq_id from t_test_sample where reception_interval_id = #{intervalId} order by seq_id
-    </select>
-    <select id="selectCollectorSequencesByInterval" resultType="long">
-        select distinct sequence_id from t_test_collector_sample where reception_interval_id = #{intervalId} order by sequence_id
-    </select>
-    <select id="selectOpenIntegrityIssue" resultMap="TTestIntegrityIssueResultMap">
-        select * from t_test_integrity_issue where interval_id = #{intervalId} and issue_status = 'OPEN'
-          and source_type = #{sourceType} and source_id = #{sourceId}
-          and (source_channel_code = #{sourceChannelCode} or (source_channel_code is null and #{sourceChannelCode} is null))
-          and (missing_from_sequence = #{missingFrom} or (missing_from_sequence is null and #{missingFrom} is null))
-          and (missing_to_sequence = #{missingTo} or (missing_to_sequence is null and #{missingTo} is null)) limit 1
-    </select>
-    <select id="selectOpenIntegrityIssues" resultMap="TTestIntegrityIssueResultMap">
-        select * from t_test_integrity_issue where interval_id = #{intervalId} and issue_status = 'OPEN'
-          and source_type = #{sourceType} and source_id = #{sourceId}
-          and (source_channel_code = #{sourceChannelCode} or (source_channel_code is null and #{sourceChannelCode} is null))
-        order by issue_id
-    </select>
-    <insert id="insertIntegrityIssue" parameterType="com.ruoyi.system.domain.TTestIntegrityIssue" useGeneratedKeys="true" keyProperty="issueId">
-        insert into t_test_integrity_issue
-        (test_id, interval_id, binding_id, source_type, source_id, source_channel_code, issue_type, issue_status,
-         missing_from_sequence, missing_to_sequence, retry_count, detail, first_detected_at_utc, last_detected_at_utc)
-        values (#{testId}, #{intervalId}, #{bindingId}, #{sourceType}, #{sourceId}, #{sourceChannelCode}, #{issueType}, 'OPEN',
-                #{missingFromSequence}, #{missingToSequence}, #{retryCount}, #{detail}, #{firstDetectedAtUtc}, #{lastDetectedAtUtc})
-    </insert>
-    <update id="touchIntegrityIssue">
-        update t_test_integrity_issue set retry_count = #{retryCount}, detail = #{detail}, last_detected_at_utc = #{detectedAtUtc}
-        where issue_id = #{issueId} and issue_status = 'OPEN'
-    </update>
-    <update id="rewindBackfillCursor">
-        update t_test_backfill_cursor set next_position = least(next_position, #{nextPosition}),
-            source_status = 'PENDING', last_error = '区间序号缺口待重试', updated_at_utc = utc_timestamp(3)
-        where test_id = #{testId} and binding_id = #{bindingId} and source_type = #{sourceType}
-          and source_id = #{sourceId}
-          and (source_channel_code = #{sourceChannelCode} or (source_channel_code is null and #{sourceChannelCode} is null))
-    </update>
-    <update id="resolveIntegrityIssues">
-        update t_test_integrity_issue set issue_status = 'RESOLVED', resolved_at_utc = #{resolvedAtUtc}
-        where test_id = #{testId} and interval_id = #{intervalId} and issue_status = 'OPEN'
-          and source_type = #{sourceType} and source_id = #{sourceId}
-          and (source_channel_code = #{sourceChannelCode} or (source_channel_code is null and #{sourceChannelCode} is null))
-    </update>
-    <update id="resolveIntegrityIssue">
-        update t_test_integrity_issue set issue_status = 'RESOLVED', resolved_at_utc = #{resolvedAtUtc}
-        where issue_id = #{issueId} and issue_status = 'OPEN'
-    </update>
-    <select id="countOpenIntegrityIssues" resultType="int">
-        select count(1) from t_test_integrity_issue where test_id = #{testId} and issue_status = 'OPEN'
-    </select>
-    <select id="countOpenExceptions" resultType="int">
-        select count(1) from t_test_exception where test_id = #{testId} and exception_status = 'OPEN'
-    </select>
     <select id="selectCollectorSampleId" resultType="long">
         select sample_id from t_test_collector_sample
         where collector_id = #{collectorId} and collector_channel_code = #{channelCode}
@@ -737,50 +540,15 @@
         where collector_id = #{collectorId} and collector_channel_code = #{channelCode}
           and sequence_id = #{sequenceId} and metric_code = #{metricCode}
     </select>
-    <insert id="insertBackfillConflict">
+    <insert id="insertSampleConflict">
         insert into t_test_exception
         (test_id, channel_id, exception_type, exception_status, severity,
          first_occurred_at_utc, last_occurred_at_utc, occurrence_count, detail)
-        values (#{testId}, #{channelId}, 'HISTORY_CONTENT_CONFLICT', 'OPEN', 'WARNING', utc_timestamp(3),
+        values (#{testId}, #{channelId}, 'SAMPLE_CONTENT_CONFLICT', 'OPEN', 'WARNING', utc_timestamp(3),
                 utc_timestamp(3), 1, #{detail})
         on duplicate key update last_occurred_at_utc = utc_timestamp(3), occurrence_count = occurrence_count + 1,
             detail = values(detail)
     </insert>
-    <select id="selectChannelLeaseForUpdate" parameterType="Long" resultMap="TTestBindingResultMap">
-        select binding.binding_id, binding.test_id, binding.battery_relation_id, binding.channel_id,
-               binding.claim_status
-        from t_channel_lease lease
-        join t_test_channel_binding binding on binding.binding_id = lease.binding_id
-        where lease.channel_id = #{channelId}
-        for update
-    </select>
-    <insert id="insertChannelLease">
-        insert into t_channel_lease(channel_id, test_id, binding_id, acquired_by, acquired_at_utc)
-        values(#{channelId}, #{testId}, #{bindingId}, #{acquiredBy}, #{acquiredAtUtc})
-    </insert>
-    <insert id="insertCollectorChannelLease">
-        insert into t_collector_channel_lease(collector_id, channel_code, test_id, binding_id, acquired_by, acquired_at_utc)
-        values(#{collectorId}, #{channelCode}, #{testId}, #{bindingId}, #{acquiredBy}, #{acquiredAtUtc})
-    </insert>
-    <insert id="insertReceptionInterval">
-        insert into t_test_reception_interval
-        (test_id, binding_id, source_type, source_id, source_channel_code,
-         action_at_utc, start_boundary_at_utc, boundary_note, interval_status)
-        values(#{testId}, #{bindingId}, #{sourceType}, #{sourceId}, #{sourceChannelCode},
-               #{actionAtUtc}, #{actionAtUtc}, #{boundaryNote}, 'OPEN')
-    </insert>
-    <update id="closeOpenReceptionIntervals">
-        update t_test_reception_interval
-        set end_boundary_at_utc = #{endBoundaryAtUtc},
-            boundary_note = #{boundaryNote}, interval_status = 'CLOSED'
-        where test_id = #{testId} and interval_status = 'OPEN'
-    </update>
-    <delete id="deleteChannelLeasesByTestId">
-        delete from t_channel_lease where test_id = #{testId}
-    </delete>
-    <delete id="deleteCollectorChannelLeasesByTestId">
-        delete from t_collector_channel_lease where test_id = #{testId}
-    </delete>
     <select id="hasReceivingTestForAdapter" resultType="int">
         select count(1)
         from t_test_channel_binding binding
@@ -788,15 +556,6 @@
         join t_detection_channel channel_fact on channel_fact.channel_id = binding.channel_id
         where channel_fact.adapter_code = #{adapterCode}
           and test_fact.reception_status = 'RECEIVING'
-          and test_fact.del_flag = 0 and channel_fact.del_flag = 0
-    </select>
-    <select id="hasPausedOrEndedTestForAdapter" resultType="int">
-        select count(1)
-        from t_test_channel_binding binding
-        join t_test test_fact on test_fact.test_id = binding.test_id
-        join t_detection_channel channel_fact on channel_fact.channel_id = binding.channel_id
-        where channel_fact.adapter_code = #{adapterCode}
-          and test_fact.reception_status in ('PAUSED', 'ENDED')
           and test_fact.del_flag = 0 and channel_fact.del_flag = 0
     </select>
     <select id="selectReceivingChannelsForAdapter" resultType="com.ruoyi.system.domain.TDetectionChannel">
@@ -838,54 +597,10 @@
     <update id="updateReceptionStopped">
         update t_test
         set test_status = 'COMPLETED', reception_status = 'ENDED', ended_at_utc = #{endedAtUtc},
-            backfill_status = 'COMPLETED',
             update_by = #{updateBy}, update_time = #{endedAtUtc}
         where test_id = #{testId} and reception_status in ('RECEIVING', 'PAUSED') and del_flag = 0
     </update>
 
-    <select id="selectReceivingCollectorSources" resultType="com.ruoyi.system.domain.TTestCollectorSource">
-        select test_fact.test_id testId, battery.relation_id batteryRelationId, battery.battery_no batteryNo,
-               collector.collector_id collectorId, collector.collector_code collectorCode,
-               mapping.channel_code channelCode
-        from t_test test_fact
-        join t_test_battery battery on battery.test_id = test_fact.test_id and battery.del_flag = 0
-        join t_collector collector on collector.collector_id = battery.collector_id
-            and collector.del_flag = 0
-        join t_test_collector_channel mapping on mapping.battery_relation_id = battery.relation_id
-            and mapping.test_id = test_fact.test_id
-        where test_fact.reception_status = 'RECEIVING' and test_fact.del_flag = 0
-        order by test_fact.test_id, battery.relation_id, mapping.mapping_id
-    </select>
-    <select id="selectOpenCollectorException" resultMap="TTestCollectorExceptionIntervalResultMap">
-        select * from t_test_collector_exception_interval
-        where test_id = #{testId} and battery_relation_id = #{batteryRelationId}
-          and collector_id = #{collectorId} and collector_channel_code = #{channelCode}
-          and exception_type = 'COLLECTOR_DISCONNECTED' and interval_status = 'OPEN'
-        order by interval_id desc limit 1
-    </select>
-    <insert id="insertCollectorExceptionInterval" parameterType="TTestCollectorExceptionInterval" useGeneratedKeys="true" keyProperty="intervalId">
-        insert into t_test_collector_exception_interval
-        (test_id, battery_relation_id, collector_id, collector_channel_code, exception_type,
-         opened_at_utc, missing_from_utc, detail)
-        values (#{testId}, #{batteryRelationId}, #{collectorId}, #{collectorChannelCode},
-                #{exceptionType}, #{openedAtUtc}, #{missingFromUtc}, #{detail})
-    </insert>
-    <update id="closeCollectorExceptionInterval">
-        update t_test_collector_exception_interval
-        set recovered_at_utc = #{recoveredAtUtc}, missing_to_utc = #{missingToUtc}, interval_status = 'CLOSED'
-        where interval_id = #{intervalId} and interval_status = 'OPEN'
-    </update>
-    <select id="selectCollectorExceptionIntervals" parameterType="Long" resultMap="TTestCollectorExceptionIntervalResultMap">
-        select exception_fact.*, collector.collector_code, collector.collector_name,
-               mapping.measurement_name
-        from t_test_collector_exception_interval exception_fact
-        left join t_collector collector on collector.collector_id = exception_fact.collector_id
-        left join t_test_collector_channel mapping on mapping.battery_relation_id = exception_fact.battery_relation_id
-            and mapping.collector_id = exception_fact.collector_id
-            and mapping.channel_code = exception_fact.collector_channel_code
-        where exception_fact.test_id = #{testId} and exception_fact.interval_status = 'OPEN'
-        order by exception_fact.opened_at_utc, exception_fact.interval_id
-    </select>
     <resultMap id="TTestDataOverrideResultMap" type="com.ruoyi.system.domain.TTestDataOverride">
         <id property="overrideId" column="override_id"/><result property="testId" column="test_id"/>
         <result property="dataType" column="data_type"/><result property="stableIdentity" column="stable_identity"/>

--
Gitblit v1.7.1