From 83fdb3c7421b1049e731c01235daa354fd8bacfb Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E7=8E=8B=E5=85=B4=E7=90=B3?= <1911390090@qq.com>
Date: Wed, 30 Apr 2025 12:49:59 +0800
Subject: [PATCH] =?UTF-8?q?=E8=AE=BE=E5=A4=87=E5=9C=A8=E7=BA=BF=E6=8E=92?=
 =?UTF-8?q?=E5=BA=8F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../controller/DcDeviceOnlineController.java   | 18 +-----------------
 .../main/resources/mapper/OnlineSumMapper.xml  |  3 ++-
 2 files changed, 3 insertions(+), 18 deletions(-)

diff --git a/zc-business/src/main/java/com/zc/business/controller/DcDeviceOnlineController.java b/zc-business/src/main/java/com/zc/business/controller/DcDeviceOnlineController.java
index 38c956e7..5b1d8ee5 100644
--- a/zc-business/src/main/java/com/zc/business/controller/DcDeviceOnlineController.java
+++ b/zc-business/src/main/java/com/zc/business/controller/DcDeviceOnlineController.java
@@ -120,23 +120,7 @@ public class DcDeviceOnlineController extends BaseController {
             params.setStakeMark(stakeMark.replace(UniversalEnum.BLANK_SPACE.getValue(), UniversalEnum.PLUS_SIGN.getValue()));
         }
         List<OnlineSum> sums = onlineSumService.queryByDeviceTypesOfToday(params);
-        // 按桩号排序
-        List<OnlineSum> sortedSums = sums.stream()
-                .sorted(Comparator.comparing(OnlineSum::getStakeMark))
-                .collect(Collectors.toList());
-        /*Map<String,OnlineSum> onlineSumMap = redisCache.getCacheMap(RedisKeyConstants.DEVICE_ONLINE);
-        String date = LocalDate.now().toString();*/
-        /*for (OnlineSum sum : sums) {
-            String deviceId = sum.getDeviceId().toString();
-            String hKey = date+":"+deviceId;
-            OnlineSum online = onlineSumMap.get(hKey);
-            if(ObjectUtils.isEmpty(online)) {
-                continue;
-            }
-            sum.setLastOnlineTime(onlineSumMap.get(hKey).getLastOnlineTime());
-            sum.setDeviceStatus(onlineSumMap.get(hKey).getDeviceStatus());
-        }*/
-        return getDataTable(sortedSums);
+        return getDataTable(sums);
     }
 
     //按时间划分设备柱状图
diff --git a/zc-business/src/main/resources/mapper/OnlineSumMapper.xml b/zc-business/src/main/resources/mapper/OnlineSumMapper.xml
index 3e380ba5..54170e22 100644
--- a/zc-business/src/main/resources/mapper/OnlineSumMapper.xml
+++ b/zc-business/src/main/resources/mapper/OnlineSumMapper.xml
@@ -119,8 +119,9 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <if test="useState != null and useState != ''">
             and d.use_state = #{useState}
         </if>
+        order by d.stake_mark
         <if test="orderByField != null and orderDirection != null">
-            order by ${orderByField} ${orderDirection}
+         , ${orderByField} ${orderDirection}
         </if>
     </select>
     <delete id="remove" parameterType="string">