From b148b1854bf07039ffef746b90337ff14b2cd7da Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E7=8E=8B=E5=85=B4=E7=90=B3?= <1911390090@qq.com>
Date: Mon, 25 Nov 2024 16:20:24 +0800
Subject: [PATCH] =?UTF-8?q?=E5=BC=82=E5=B8=B8=E8=AE=BE=E5=A4=87=E7=AD=9B?=
 =?UTF-8?q?=E9=80=89=E6=9D=A1=E4=BB=B6?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../controller/DcDeviceOnlineController.java   | 18 ++++++++++++++++--
 .../business/domain/DcDeviceOfflineRecord.java | 11 +++++++++++
 .../business/DcDeviceOfflineRecordMapper.xml   |  2 +-
 3 files changed, 28 insertions(+), 3 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 52e08c39..a3c4a701 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
@@ -367,9 +367,15 @@ public class DcDeviceOnlineController extends BaseController {
         String FAIL_RATE = "failRate";//离线率
         String SUM_USE_STATE = "sumUseState";//在用数
         String SUM = "sum";//总数
-        Map<String, Object> returnMap = new HashMap<>();
+        Map<String, Object> returnMap = new LinkedHashMap<>();
         List<DcDevice> dcDeviceList = dcDeviceService.list();
         List<DcRoadSection> dcRoadSections = dcRoadSectionService.selectDcRoadSectionList(new DcRoadSection());
+
+        // 创建一个映射存储roadId到sectionName
+        Map<String, String> roadIdToSectionNameMap = new HashMap<>();
+        for (DcRoadSection dcRoadSection : dcRoadSections) {
+            roadIdToSectionNameMap.put(dcRoadSection.getId().toString(), dcRoadSection.getSectionName());
+        }
 /*        // 去重设备列表
         dcDeviceList = dcDeviceList.stream()
                 .distinct()
@@ -417,6 +423,7 @@ public class DcDeviceOnlineController extends BaseController {
                 devicesInRoad.forEach(device -> System.out.println("Device ID: " + device.getId() + ", Stake Mark: " + device.getStakeMark()));
             }*/
         }
+        List<Map.Entry<String, Object>> sortedEntries = new ArrayList<>();
         for (DcRoadSection dcRoadSection : dcRoadSections) {
             Map<String, Object> itemMap = new HashMap<>();
             String roadId = dcRoadSection.getId().toString();
@@ -445,8 +452,15 @@ public class DcDeviceOnlineController extends BaseController {
 
             // 丢包率暂时设置为空
             itemMap.put(LOST_RATE, "");
+            // 添加到列表中
+            sortedEntries.add(new AbstractMap.SimpleEntry<>(roadId, itemMap));
+            // 将排序后的条目添加到returnMap中，使用sectionName作为键
+            for (Map.Entry<String, Object> entry : sortedEntries) {
+                String Id = entry.getKey();
+                String sectionName = roadIdToSectionNameMap.get(Id);
+                returnMap.put(sectionName, entry.getValue());
+            }
 
-            returnMap.put(dcRoadSection.getSectionName(), itemMap);
         }
 
         return AjaxResult.success(returnMap);
diff --git a/zc-business/src/main/java/com/zc/business/domain/DcDeviceOfflineRecord.java b/zc-business/src/main/java/com/zc/business/domain/DcDeviceOfflineRecord.java
index ae0528ec..035091ce 100644
--- a/zc-business/src/main/java/com/zc/business/domain/DcDeviceOfflineRecord.java
+++ b/zc-business/src/main/java/com/zc/business/domain/DcDeviceOfflineRecord.java
@@ -1,5 +1,6 @@
 package com.zc.business.domain;
 
+import com.baomidou.mybatisplus.annotation.TableField;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import org.apache.commons.lang3.builder.ToStringBuilder;
@@ -62,6 +63,9 @@ public class DcDeviceOfflineRecord extends BaseEntity
     @Excel(name = "所在桩号")
     @ApiModelProperty(value="所在桩号")
     private String stakeMark;
+    @TableField(exist = false)
+    private String endStakeMark;
+
 
     /** 方向1-上行,2-中,3-下行 */
     @ApiModelProperty(value="方向")
@@ -126,6 +130,13 @@ public class DcDeviceOfflineRecord extends BaseEntity
     @Excel(name = "诊断结果")
     private String diagnostics;
 
+    public String getEndStakeMark() {
+        return endStakeMark;
+    }
+
+    public void setEndStakeMark(String endStakeMark) {
+        this.endStakeMark = endStakeMark;
+    }
     public void setId(Long id)
     {
         this.id = id;
diff --git a/zc-business/src/main/resources/mapper/business/DcDeviceOfflineRecordMapper.xml b/zc-business/src/main/resources/mapper/business/DcDeviceOfflineRecordMapper.xml
index 93655567..b2d8d853 100644
--- a/zc-business/src/main/resources/mapper/business/DcDeviceOfflineRecordMapper.xml
+++ b/zc-business/src/main/resources/mapper/business/DcDeviceOfflineRecordMapper.xml
@@ -36,7 +36,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="iotDeviceId != null "> and iot_device_id = #{iotDeviceId}</if>
             <if test="deviceName != null  and deviceName != ''"> and device_name like concat('%', #{deviceName}, '%')</if>
             <if test="deviceType != null  and deviceType != ''"> and device_type = #{deviceType}</if>
-            <if test="stakeMark != null  and stakeMark != ''"> and stake_mark = #{stakeMark}</if>
+            <if test="stakeMark != null  and stakeMark != ''"> and stake_mark BETWEEN #{stakeMark} and #{endStakeMark} </if>
             <if test="direction != null  and direction != ''"> and direction = #{direction}</if>
             <if test="installationSite != null  and installationSite != ''"> and installation_site = #{installationSite}</if>
             <if test="deviceIp != null  and deviceIp != ''"> and device_ip = #{deviceIp}</if>