From 3eee2147f220634b620b7ed84c97fbd8257205d5 Mon Sep 17 00:00:00 2001
From: zyh <zyh@123>
Date: 星期二, 13 一月 2026 13:21:44 +0800
Subject: [PATCH] 修改了AGV的接口以及mas获取的数据

---
 src/main/resources/mapper/ViewDigitalTwinMapper.xml |   82 +++++++++++++++++++---------------------
 1 files changed, 39 insertions(+), 43 deletions(-)

diff --git a/src/main/resources/mapper/ViewDigitalTwinMapper.xml b/src/main/resources/mapper/ViewDigitalTwinMapper.xml
index 957e7e4..371ddb7 100644
--- a/src/main/resources/mapper/ViewDigitalTwinMapper.xml
+++ b/src/main/resources/mapper/ViewDigitalTwinMapper.xml
@@ -3,39 +3,32 @@
         "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
 <mapper namespace="com.zy.asrs.mapper.DigitalTwinMapper">
 
-    <resultMap id="dtOrderMap" type="com.zy.asrs.entity.digitaltwin.DtOrderVo">
-        <constructor>
-            <arg column="orderDate" javaType="java.util.Date"/>
-            <arg column="orderNum" javaType="java.lang.Integer"/>
-        </constructor>
-    </resultMap>
-
     <!--鎬昏锛氭�诲簱浣嶃�佸凡鐢ㄥ簱浣嶃�佷粖鏃ュ簱瀛樸�佷粖鏃ュ嚭搴撱�佷粖鏃ュ叆搴�-->
     <select id="overview" resultType="Double">
         SELECT COUNT(*) FROM asr_loc_mast WHERE loc_sts != 'Z'
-        <if test="areaId != null">
-            and area_id = #{areaId}
-        </if>
+        <!--            <if test="areaId != null">-->
+        <!--                and area_id = #{areaId}-->
+        <!--            </if>-->
         UNION ALL
         SELECT COUNT(*) FROM asr_loc_mast WHERE loc_sts = 'F' or loc_sts = 'P' or loc_sts = 'Q' or loc_sts = 'R' or loc_sts = 'S' or loc_sts = 'X'
-        <if test="areaId != null">
-            and area_id = #{areaId}
-        </if>
+        <!--        <if test="areaId != null">-->
+        <!--            and area_id = #{areaId}-->
+        <!--        </if>-->
         UNION ALL
         SELECT ISNULL(SUM(anfme), 0) FROM asr_loc_detl
-        <if test="areaId != null">
-            WHERE area_id = #{areaId}
-        </if>
+        <!--        <if test="areaId != null">-->
+        <!--            WHERE area_id = #{areaId}-->
+        <!--        </if>-->
         UNION ALL
         SELECT ISNULL(SUM(anfme), 0) FROM asr_wrkin_view WHERE CONVERT(VARCHAR, io_time, 23) = CONVERT(VARCHAR, GETDATE(), 23)
-        <if test="areaId != null">
-            and area_id = #{areaId}
-        </if>
+        <!--        <if test="areaId != null">-->
+        <!--            and area_id = #{areaId}-->
+        <!--        </if>-->
         UNION ALL
         SELECT ISNULL(SUM(anfme), 0) FROM asr_wrkout_view WHERE CONVERT(VARCHAR, io_time, 23) = CONVERT(VARCHAR, GETDATE(), 23)
-        <if test="areaId != null">
-            and area_id = #{areaId}
-        </if>
+        <!--        <if test="areaId != null">-->
+        <!--            and area_id = #{areaId}-->
+        <!--        </if>-->
     </select>
 
     <select id="recentOrder" resultType="com.zy.asrs.entity.digitaltwin.DtOrderVo">
@@ -65,9 +58,9 @@
         SELECT CONVERT(VARCHAR, io_time, 23) AS boundDate, SUM(anfme) AS inBoundNum
         FROM asr_wrkin_view
         WHERE io_time BETWEEN #{startTime} AND #{endTime}
-        <if test="areaId != null">
-            and area_id = #{areaId}
-        </if>
+        <!--        <if test="areaId != null">-->
+        <!--            and area_id = #{areaId}-->
+        <!--        </if>-->
         GROUP BY CONVERT(VARCHAR, io_time, 23)
     </select>
 
@@ -75,28 +68,31 @@
         SELECT CONVERT(VARCHAR, io_time, 23) AS boundDate, SUM(anfme) AS outBoundNum
         FROM asr_wrkout_view
         WHERE io_time BETWEEN #{startTime} AND #{endTime}
-        <if test="areaId != null">
-            and area_id = #{areaId}
-        </if>
+        <!--        <if test="areaId != null">-->
+        <!--            and area_id = #{areaId}-->
+        <!--        </if>-->
         GROUP BY CONVERT(VARCHAR, io_time, 23)
     </select>
 
     <select id="recentDetainMat" resultType="com.zy.asrs.entity.digitaltwin.DtDetainMatVo">
-        select
-        *
-        from (
-        select
-        ROW_NUMBER() OVER(Order by t.io_time desc) as row , *
-        from (
-        SELECT area_id AS belongAreaId, area_name AS belongAreaName, matnr AS matId, maktx AS matName,
-        loc_no AS lokId, '' AS lokName,
-        DATEDIFF(MINUTE, appe_time, GETDATE()) AS detainTime, appe_time AS inBoundTime
-        FROM asr_loc_detl WHERE appe_time &lt; #{startTime}
-        <if test="areaId != null">
-            and area_id = #{areaId}
-        </if>
-        ) t
-        ) a where 1=1 and a.row between ((#{pageIndex}-1)*#{pageSize}+1) and (#{pageIndex}*#{pageSize})
+        SELECT *
+        FROM (
+                 SELECT
+                     ROW_NUMBER() OVER(ORDER BY t.inBoundTime DESC) AS rownum,
+                     t.*
+                 FROM (
+                          SELECT
+                              matnr AS matId,
+                              maktx AS matName,
+                              loc_no AS lokId,
+                              '' AS lokName,
+                              DATEDIFF(MINUTE, appe_time, GETDATE()) AS detainTime,
+                              appe_time AS inBoundTime
+                          FROM asr_loc_detl
+                          WHERE appe_time &lt;= #{startTime}
+                      ) t
+             ) a
+        WHERE a.rownum BETWEEN ((#{pageIndex}-1)*#{pageSize}+1) AND (#{pageIndex}*#{pageSize})
     </select>
 
 </mapper>

--
Gitblit v1.9.1