From bd67ba5a84dbd377a8433f40f4cead3469cbb342 Mon Sep 17 00:00:00 2001 From: CZ Date: Sun, 23 Jun 2024 19:08:51 +0800 Subject: [PATCH] =?UTF-8?q?=E7=8E=B0=E5=9C=BA=E6=9B=B4=E6=94=B9=E6=8F=90?= =?UTF-8?q?=E4=BA=A4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- Repository/Station/EquipInfoRepository.cs | 1 - Service/Station/MonitorService.cs | 2 +- WebStarter/Controllers/Ammeter/AmmeterController.cs | 4 ++-- 3 files changed, 3 insertions(+), 4 deletions(-) diff --git a/Repository/Station/EquipInfoRepository.cs b/Repository/Station/EquipInfoRepository.cs index ba2226f..8502be6 100644 --- a/Repository/Station/EquipInfoRepository.cs +++ b/Repository/Station/EquipInfoRepository.cs @@ -34,7 +34,6 @@ namespace Repository.Station .OrderBuilder(input) .WithNoLockOrNot(blUseNoLock) .ToPageListAsync(pageNumber, pageSize, totalNumber); - page.Reverse();//倒序一下 return page; } } diff --git a/Service/Station/MonitorService.cs b/Service/Station/MonitorService.cs index fad9778..5a28cd2 100644 --- a/Service/Station/MonitorService.cs +++ b/Service/Station/MonitorService.cs @@ -114,7 +114,7 @@ public class MonitorService DeviceStateResp resp = new() { - BoxConnectFlag = isConnected != null ? isConnected : false, + BoxConnectFlag = isConnected, CloudConnectFlag = CloudClientMgr.CloudClient == null ? false : CloudClientMgr.CloudClient.Connected, PlcConnectFlag = PlcMgr.PlcClient == null ? false : PlcMgr.PlcClient.Connected }; diff --git a/WebStarter/Controllers/Ammeter/AmmeterController.cs b/WebStarter/Controllers/Ammeter/AmmeterController.cs index 1591e95..9a4977f 100644 --- a/WebStarter/Controllers/Ammeter/AmmeterController.cs +++ b/WebStarter/Controllers/Ammeter/AmmeterController.cs @@ -190,8 +190,8 @@ namespace WebStarter.Controllers.Ammeter // 类型赋值交流 EnergyChangeList?.ForEach(emeterResp => emeterResp.Type = 1); - resp.emeterEnergy = EnergyList; - resp.emeterEnergyChange = EnergyChangeList; + resp.emeterEnergy = EnergyList.OrderBy(i=>i.Code).ToList(); + resp.emeterEnergyChange = EnergyChangeList.OrderBy(i=>i.Code).ToList(); } ///