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(); } ///