现场更改提交

zw
CZ 5 months ago
parent 89a25d390a
commit bd67ba5a84

@ -34,7 +34,6 @@ namespace Repository.Station
.OrderBuilder(input) .OrderBuilder(input)
.WithNoLockOrNot(blUseNoLock) .WithNoLockOrNot(blUseNoLock)
.ToPageListAsync(pageNumber, pageSize, totalNumber); .ToPageListAsync(pageNumber, pageSize, totalNumber);
page.Reverse();//倒序一下
return page; return page;
} }
} }

@ -114,7 +114,7 @@ public class MonitorService
DeviceStateResp resp = new() DeviceStateResp resp = new()
{ {
BoxConnectFlag = isConnected != null ? isConnected : false, BoxConnectFlag = isConnected,
CloudConnectFlag = CloudClientMgr.CloudClient == null ? false : CloudClientMgr.CloudClient.Connected, CloudConnectFlag = CloudClientMgr.CloudClient == null ? false : CloudClientMgr.CloudClient.Connected,
PlcConnectFlag = PlcMgr.PlcClient == null ? false : PlcMgr.PlcClient.Connected PlcConnectFlag = PlcMgr.PlcClient == null ? false : PlcMgr.PlcClient.Connected
}; };

@ -190,8 +190,8 @@ namespace WebStarter.Controllers.Ammeter
// 类型赋值交流 // 类型赋值交流
EnergyChangeList?.ForEach(emeterResp => emeterResp.Type = 1); EnergyChangeList?.ForEach(emeterResp => emeterResp.Type = 1);
resp.emeterEnergy = EnergyList; resp.emeterEnergy = EnergyList.OrderBy(i=>i.Code).ToList();
resp.emeterEnergyChange = EnergyChangeList; resp.emeterEnergyChange = EnergyChangeList.OrderBy(i=>i.Code).ToList();
} }
/// <summary> /// <summary>

Loading…
Cancel
Save