设备在线排序

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);
     }
 
     //按时间划分设备柱状图

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">