From 444b1808d73d21f9df361e64f44381b910947792 Mon Sep 17 00:00:00 2001
From: yangys <y_ys79@sina.com>
Date: 星期五, 27 九月 2024 11:05:08 +0800
Subject: [PATCH] 去掉tdedgine,去掉一部分rocketmq,去掉dmplog模块

---
 smart-man-boot/src/main/resources/com/qianwen/smartman/modules/mdc/mapper/SuperAggregateStateFeedbackMapper.xml |   15 ++++-----------
 1 files changed, 4 insertions(+), 11 deletions(-)

diff --git a/smart-man-boot/src/main/resources/com/qianwen/smartman/modules/mdc/mapper/SuperAggregateStateFeedbackMapper.xml b/smart-man-boot/src/main/resources/com/qianwen/smartman/modules/mdc/mapper/SuperAggregateStateFeedbackMapper.xml
index 08d6275..41c7981 100644
--- a/smart-man-boot/src/main/resources/com/qianwen/smartman/modules/mdc/mapper/SuperAggregateStateFeedbackMapper.xml
+++ b/smart-man-boot/src/main/resources/com/qianwen/smartman/modules/mdc/mapper/SuperAggregateStateFeedbackMapper.xml
@@ -23,14 +23,6 @@
         feedback_id as feedbackId
     </sql>
 
-
-    
-
-
-
-    
-
-
 	<!-- 淇敼sql寮�濮� -->
 	
 	<sql id="aggregateStateColumnSql">
@@ -48,14 +40,15 @@
         rps,
         is_deleted as isDeleted,
         workstation_id as workstationId,
-        is_plan as isPlan
+        is_plan as isPlan,
+        feedback_id as feedbackId
     </sql>
     
 	<!-- 鐢变簬琛ㄦ暟鎹竴鏍凤紙iot_data.super_aggregate_state_with_feedback锛夛紝鎴戜滑涔熸病鏈夊弽棣堬紝鎵�浠ユ殏鏃堕兘鏌ヤ竴涓〃 -->
 	<select id="getStatusData" resultType="com.qianwen.smartman.modules.mdc.entity.SuperAggregateState">
         select
         <include refid="aggregateStateColumnSql"/>
-        from root.f2.aggregate_state_*
+        from root.f2.aggregate_state_with_feedback_*
         where is_deleted = false
         and wcs > 0
         and time <![CDATA[>=]]> #{startDate} and time <![CDATA[<=]]> #{endDate}
@@ -72,7 +65,7 @@
             resultType="com.qianwen.smartman.modules.mdc.entity.SuperAggregateState">
         select 
         <include refid="aggregateStateColumnSql"/>
-        from root.f2.aggregate_state_*
+        from root.f2.aggregate_state_with_feedback_*
         where factory_date <![CDATA[>=]]> #{startFactoryDate} and factory_date <![CDATA[<=]]> #{endFactoryDate}
         and wcs > 0 and is_deleted = false
         <if test="workstationIds != null and workstationIds.size() > 0">

--
Gitblit v1.9.3