From 9cd82fb7f14dba73dfe5e8bc46b14fd821c2c30c Mon Sep 17 00:00:00 2001 From: lxw Date: Fri, 7 Jun 2024 18:38:00 +0800 Subject: [PATCH] =?UTF-8?q?=E7=BB=9F=E4=B8=80page?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- Service/Ammeter/EmeterHourEnergyService.cs | 7 ++++--- .../Controllers/Ammeter/AmmeterController.cs | 10 +++++----- .../Controllers/ChargeMonitorController.cs | 4 ++-- .../ExStationDayRunResultController.cs | 4 ++-- .../System/BatteryOpModelController.cs | 10 ++++++---- .../System/Dict/SysDictDataController.cs | 4 ++-- .../System/Dict/SysDictTypeController.cs | 4 ++-- .../Controllers/System/SysConfigController.cs | 4 ++-- .../Controllers/System/SysFileController.cs | 4 ++-- .../System/SysLog/SysLogDiffController.cs | 4 ++-- .../System/SysLog/SysLogExController.cs | 4 ++-- .../System/SysLog/SysLogOpController.cs | 4 ++-- .../System/SysLog/SysLogVisController.cs | 4 ++-- .../Controllers/System/SysRoleController.cs | 4 ++-- .../Controllers/System/SysUserController.cs | 4 ++-- .../obj/Debug/net6.0/staticwebassets.build.json | 16 ++++++++-------- 16 files changed, 47 insertions(+), 44 deletions(-) diff --git a/Service/Ammeter/EmeterHourEnergyService.cs b/Service/Ammeter/EmeterHourEnergyService.cs index d89c628..57aed24 100644 --- a/Service/Ammeter/EmeterHourEnergyService.cs +++ b/Service/Ammeter/EmeterHourEnergyService.cs @@ -2,6 +2,7 @@ using Entity.Dto.Req; using HybirdFrameworkCore.Autofac.Attribute; using HybirdFrameworkCore.Entity; +using Microsoft.AspNetCore.Mvc.RazorPages; using Repository.Ammeter; namespace Service.Ammeter @@ -17,7 +18,7 @@ namespace Service.Ammeter this.BaseDal = service; } - public async Task> Page(PageAmmeterReq queryPageModel) + public async Task>> Page(PageAmmeterReq queryPageModel) { QueryPageModel queryPageModel1 = new QueryPageModel { @@ -25,9 +26,9 @@ namespace Service.Ammeter PageSize = queryPageModel.PageSize, }; if (!string.IsNullOrEmpty(queryPageModel.Code)) - return PageResult.ConvertPage(this.BaseDal.QueryIPageByCause(queryPageModel1, u => u.Code == queryPageModel.Code)); + return Result>.Success(PageResult.ConvertPage(this.BaseDal.QueryIPageByCause(queryPageModel1, u => u.Code == queryPageModel.Code))); else - return PageResult.ConvertPage(this.BaseDal.QueryIPageByCause(queryPageModel1, null)); + return Result>.Success(PageResult.ConvertPage(this.BaseDal.QueryIPageByCause(queryPageModel1, null))); } } } diff --git a/WebStarter/Controllers/Ammeter/AmmeterController.cs b/WebStarter/Controllers/Ammeter/AmmeterController.cs index 84c8cbe..9d76f6a 100644 --- a/WebStarter/Controllers/Ammeter/AmmeterController.cs +++ b/WebStarter/Controllers/Ammeter/AmmeterController.cs @@ -104,9 +104,9 @@ namespace WebStarter.Controllers.Ammeter /// 统计分析/电能表变化值信息 /// [HttpPost("TEgEmeterRealEnergyValue")] - public async Task> GetEmeterMinutesEnergyChange([FromBody] PageAmmeterReq queryPageModel) + public async Task>> GetEmeterMinutesEnergyChange([FromBody] PageAmmeterReq queryPageModel) { - return await _emeterMinutesEnergyChangeService.Page(queryPageModel); + return Result>.Success(await _emeterMinutesEnergyChangeService.Page(queryPageModel)); } /// @@ -133,7 +133,7 @@ namespace WebStarter.Controllers.Ammeter /// 统计分析/电能表小时能耗值 /// [HttpPost("TEgEmeterHourEnergyValue")] - public async Task> GetEmeterHourEnergy([FromBody] PageAmmeterReq queryPageModel) + public async Task>> GetEmeterHourEnergy([FromBody] PageAmmeterReq queryPageModel) { return await _emeterHourEnergyService.Page(queryPageModel); } @@ -161,9 +161,9 @@ namespace WebStarter.Controllers.Ammeter /// 统计分析/电能表每天能耗值 /// [HttpPost("TEgEmeterDayEnergyValue")] - public async Task> GetEmeterDayEnergy([FromBody] PageAmmeterReq queryPageModel) + public async Task>> GetEmeterDayEnergy([FromBody] PageAmmeterReq queryPageModel) { - return await _emeterDayEnergyService.Page(queryPageModel); + return Result>.Success(await _emeterDayEnergyService.Page(queryPageModel)); } /// diff --git a/WebStarter/Controllers/ChargeMonitorController.cs b/WebStarter/Controllers/ChargeMonitorController.cs index d2b71cd..c70fdd4 100644 --- a/WebStarter/Controllers/ChargeMonitorController.cs +++ b/WebStarter/Controllers/ChargeMonitorController.cs @@ -33,10 +33,10 @@ public class ChargeMonitorController /// 充电仓查询：条件：仓位编号 仓位名称 /// [HttpPost("ChargePositionQuery")] - public async Task> ChargePositionQuery( + public async Task>> ChargePositionQuery( [FromBody] ChargePositionQueryReq chargePositionQueryReq) { - return await _binInfoService.ChargePositionQuery(chargePositionQueryReq); + return Result>.Success( await _binInfoService.ChargePositionQuery(chargePositionQueryReq)); } /// diff --git a/WebStarter/Controllers/ExStationDayRunResultController.cs b/WebStarter/Controllers/ExStationDayRunResultController.cs index 743bccb..74b3834 100644 --- a/WebStarter/Controllers/ExStationDayRunResultController.cs +++ b/WebStarter/Controllers/ExStationDayRunResultController.cs @@ -26,9 +26,9 @@ namespace WebStarter.Controllers /// /// [HttpPost("GetExStationDaySwapRunRes")] - public async Task> GetExStationDaySwapRunRes([FromBody] QueryPageModel queryPageModel) + public async Task>> GetExStationDaySwapRunRes([FromBody] QueryPageModel queryPageModel) { - return await _exStationDayRunResultService.ExStationDaySwapRunRes(queryPageModel); + return Result>.Success(await _exStationDayRunResultService.ExStationDaySwapRunRes(queryPageModel)); } /// diff --git a/WebStarter/Controllers/System/BatteryOpModelController.cs b/WebStarter/Controllers/System/BatteryOpModelController.cs index b43801f..59b75ea 100644 --- a/WebStarter/Controllers/System/BatteryOpModelController.cs +++ b/WebStarter/Controllers/System/BatteryOpModelController.cs @@ -5,6 +5,7 @@ using Entity.DbModel.System; using Entity.Dto.Req; using HybirdFrameworkCore.Entity; using Microsoft.AspNetCore.Mvc; +using Microsoft.AspNetCore.Mvc.RazorPages; using Service.Station; namespace WebStarter.Controllers.System; @@ -30,9 +31,9 @@ public class BatteryOpModelController /// [HttpPost] [Route("page")] - public async Task> BatteryOpModelPageList([FromBody] PageBatteryOpReq input) + public async Task>> BatteryOpModelPageList([FromBody] PageBatteryOpReq input) { - return await _batteryOpModelService.Page(input); + return Result>.Success(await _batteryOpModelService.Page(input)); } /// @@ -47,7 +48,7 @@ public class BatteryOpModelController var data = await _batteryOpModelService.AddBatteryOpModel(input); return Result.Success(data); } - + /// /// 更新电池运营模型 /// @@ -63,6 +64,7 @@ public class BatteryOpModelController else return Result.Fail(data); } + /// /// 删除电池运营模型 /// @@ -70,7 +72,7 @@ public class BatteryOpModelController /// [HttpPost] [Route("delete")] - public async Task> DeleteBatteryOpModel([FromBody][Required] DeleteBatteryOpReq input) + public async Task> DeleteBatteryOpModel([FromBody] [Required] DeleteBatteryOpReq input) { var data = await _batteryOpModelService.DeleteBatteryOpModel(input); if (data) diff --git a/WebStarter/Controllers/System/Dict/SysDictDataController.cs b/WebStarter/Controllers/System/Dict/SysDictDataController.cs index 9a17035..6456938 100644 --- a/WebStarter/Controllers/System/Dict/SysDictDataController.cs +++ b/WebStarter/Controllers/System/Dict/SysDictDataController.cs @@ -20,9 +20,9 @@ namespace WebStarter.Controllers.System.Dict [HttpPost] [Route("/api/sysDictData/page")] - public async Task> DictDataPage([FromBody][Required] PageDictDataReq pageDictDataInput) + public async Task>> DictDataPage([FromBody][Required] PageDictDataReq pageDictDataInput) { - return await _sysDictDataServices.Page(pageDictDataInput); + return Result>.Success(await _sysDictDataServices.Page(pageDictDataInput)); } [HttpGet] diff --git a/WebStarter/Controllers/System/Dict/SysDictTypeController.cs b/WebStarter/Controllers/System/Dict/SysDictTypeController.cs index a65e892..dad308c 100644 --- a/WebStarter/Controllers/System/Dict/SysDictTypeController.cs +++ b/WebStarter/Controllers/System/Dict/SysDictTypeController.cs @@ -19,9 +19,9 @@ namespace WebStarter.Controllers.System.Dict [HttpPost] [Route("api/sysDictType/page")] - public async Task> DictTypePage(PageDictTypeReq input) + public async Task>> DictTypePage(PageDictTypeReq input) { - return await _sysDictTypeService.Page(input); + return Result>.Success(await _sysDictTypeService.Page(input)); } [HttpGet] diff --git a/WebStarter/Controllers/System/SysConfigController.cs b/WebStarter/Controllers/System/SysConfigController.cs index 83ea10f..c3ff886 100644 --- a/WebStarter/Controllers/System/SysConfigController.cs +++ b/WebStarter/Controllers/System/SysConfigController.cs @@ -36,9 +36,9 @@ namespace WebStarter.Controllers.System [HttpPost] [Route("page")] - public async Task> Page(PageConfigReq input) + public async Task>> Page(PageConfigReq input) { - return await _sysConfigService.Page(input); + return Result>.Success(await _sysConfigService.Page(input)); } [HttpGet] diff --git a/WebStarter/Controllers/System/SysFileController.cs b/WebStarter/Controllers/System/SysFileController.cs index 2295051..e72eb3f 100644 --- a/WebStarter/Controllers/System/SysFileController.cs +++ b/WebStarter/Controllers/System/SysFileController.cs @@ -23,9 +23,9 @@ namespace WebStarter.Controllers.System [HttpPost] [Route("/api/sysFile/page")] - public async Task> Page(PageFileReq input) + public async Task>> Page(PageFileReq input) { - return await _sysFileServices.Page(input); + return Result>.Success(await _sysFileServices.Page(input)); } [HttpPost] diff --git a/WebStarter/Controllers/System/SysLog/SysLogDiffController.cs b/WebStarter/Controllers/System/SysLog/SysLogDiffController.cs index 263499a..dbefb0e 100644 --- a/WebStarter/Controllers/System/SysLog/SysLogDiffController.cs +++ b/WebStarter/Controllers/System/SysLog/SysLogDiffController.cs @@ -20,9 +20,9 @@ namespace WebStarter.Controllers.System.SysLog [HttpPost] [Route("api/sysLogDiff/page")] - public async Task> LogDiffPage(PageLogReq input) + public async Task>> LogDiffPage(PageLogReq input) { - return await _sysLogDiffService.Page(input); + return Result>.Success(await _sysLogDiffService.Page(input)); } [HttpGet] diff --git a/WebStarter/Controllers/System/SysLog/SysLogExController.cs b/WebStarter/Controllers/System/SysLog/SysLogExController.cs index 5c35c90..8ff94c2 100644 --- a/WebStarter/Controllers/System/SysLog/SysLogExController.cs +++ b/WebStarter/Controllers/System/SysLog/SysLogExController.cs @@ -20,9 +20,9 @@ namespace WebStarter.Controllers.System.SysLog [HttpPost] [Route("api/sysLogEx/page")] - public async Task> LogExPage(PageLogReq input) + public async Task>> LogExPage(PageLogReq input) { - return await _sysLogExService.Page(input); + return Result>.Success(await _sysLogExService.Page(input)); } [HttpPost] diff --git a/WebStarter/Controllers/System/SysLog/SysLogOpController.cs b/WebStarter/Controllers/System/SysLog/SysLogOpController.cs index fe18c48..ea1c80e 100644 --- a/WebStarter/Controllers/System/SysLog/SysLogOpController.cs +++ b/WebStarter/Controllers/System/SysLog/SysLogOpController.cs @@ -19,9 +19,9 @@ namespace WebStarter.Controllers.System.SysLog [HttpPost] [Route("api/sysLogOp/page")] - public async Task> LogOpPage(PageLogReq input) + public async Task>> LogOpPage(PageLogReq input) { - return await _sysLogOpService.Page(input); + return Result>.Success(await _sysLogOpService.Page(input)); } [HttpPost] diff --git a/WebStarter/Controllers/System/SysLog/SysLogVisController.cs b/WebStarter/Controllers/System/SysLog/SysLogVisController.cs index ccd7448..adcad67 100644 --- a/WebStarter/Controllers/System/SysLog/SysLogVisController.cs +++ b/WebStarter/Controllers/System/SysLog/SysLogVisController.cs @@ -27,9 +27,9 @@ namespace WebStarter.Controllers.System.SysLog [HttpPost] [Route("api/sysLogVis/page")] - public async Task> LogVisPage(PageLogReq input) + public async Task>> LogVisPage(PageLogReq input) { - return await _sysLogVisService.Page(input); + return Result>.Success(await _sysLogVisService.Page(input)); } } } diff --git a/WebStarter/Controllers/System/SysRoleController.cs b/WebStarter/Controllers/System/SysRoleController.cs index 26cd7e0..232326f 100644 --- a/WebStarter/Controllers/System/SysRoleController.cs +++ b/WebStarter/Controllers/System/SysRoleController.cs @@ -27,9 +27,9 @@ namespace WebStarter.Controllers.System /// [HttpPost] [Route("api/sysRole/page")] - public async Task> RolePage(PageRoleReq input) + public async Task>> RolePage(PageRoleReq input) { - return await _sysRoleServices.Page(input); + return Result>.Success(await _sysRoleServices.Page(input)); } /// diff --git a/WebStarter/Controllers/System/SysUserController.cs b/WebStarter/Controllers/System/SysUserController.cs index 61d0ffa..c0f74c7 100644 --- a/WebStarter/Controllers/System/SysUserController.cs +++ b/WebStarter/Controllers/System/SysUserController.cs @@ -27,9 +27,9 @@ namespace WebStarter.Controllers.System /// [HttpPost] [Route("api/sysUser/page")] - public async Task> UserPageList([FromBody] PageUserReq input) + public async Task>> UserPageList([FromBody] PageUserReq input) { - return await _sysUserService.Page(input); + return Result>.Success(await _sysUserService.Page(input)); } //UpdateUser [HttpPost] diff --git a/WebStarter/obj/Debug/net6.0/staticwebassets.build.json b/WebStarter/obj/Debug/net6.0/staticwebassets.build.json index 86164bd..4271680 100644 --- a/WebStarter/obj/Debug/net6.0/staticwebassets.build.json +++ b/WebStarter/obj/Debug/net6.0/staticwebassets.build.json @@ -1,6 +1,6 @@ { "Version": 1, - "Hash": "PUkZxlgk8KRfiyiYD55Dczq9Q9JYZyET99LUbVltauo=", + "Hash": "kIfehZk8TWWy62IgCKeVJMphEP8JJ0AGeTvs9NqLTfU=", "Source": "WebStarter", "BasePath": "_content/WebStarter", "Mode": "Default", @@ -10,17 +10,17 @@ { "Name": "WebStarter\\wwwroot", "Source": "WebStarter", - "ContentRoot": "D:\\RiderProjects\\hn_back_main\\WebStarter\\wwwroot\\", + "ContentRoot": "D:\\lxw\\work\\pro\\c#\\hn_back_main\\WebStarter\\wwwroot\\", "BasePath": "_content/WebStarter", "Pattern": "**" } ], "Assets": [ { - "Identity": "D:\\RiderProjects\\hn_back_main\\WebStarter\\wwwroot\\20240523\\0.jpg", + "Identity": "D:\\lxw\\work\\pro\\c#\\hn_back_main\\WebStarter\\wwwroot\\20240523\\0.jpg", "SourceId": "WebStarter", "SourceType": "Discovered", - "ContentRoot": "D:\\RiderProjects\\hn_back_main\\WebStarter\\wwwroot\\", + "ContentRoot": "D:\\lxw\\work\\pro\\c#\\hn_back_main\\WebStarter\\wwwroot\\", "BasePath": "_content/WebStarter", "RelativePath": "20240523/0.jpg", "AssetKind": "All", @@ -36,10 +36,10 @@ "OriginalItemSpec": "wwwroot\\20240523\\0.jpg" }, { - "Identity": "D:\\RiderProjects\\hn_back_main\\WebStarter\\wwwroot\\20240524\\0.jpg", + "Identity": "D:\\lxw\\work\\pro\\c#\\hn_back_main\\WebStarter\\wwwroot\\20240524\\0.jpg", "SourceId": "WebStarter", "SourceType": "Discovered", - "ContentRoot": "D:\\RiderProjects\\hn_back_main\\WebStarter\\wwwroot\\", + "ContentRoot": "D:\\lxw\\work\\pro\\c#\\hn_back_main\\WebStarter\\wwwroot\\", "BasePath": "_content/WebStarter", "RelativePath": "20240524/0.jpg", "AssetKind": "All", @@ -55,10 +55,10 @@ "OriginalItemSpec": "wwwroot\\20240524\\0.jpg" }, { - "Identity": "D:\\RiderProjects\\hn_back_main\\WebStarter\\wwwroot\\20240524\\0.png", + "Identity": "D:\\lxw\\work\\pro\\c#\\hn_back_main\\WebStarter\\wwwroot\\20240524\\0.png", "SourceId": "WebStarter", "SourceType": "Discovered", - "ContentRoot": "D:\\RiderProjects\\hn_back_main\\WebStarter\\wwwroot\\", + "ContentRoot": "D:\\lxw\\work\\pro\\c#\\hn_back_main\\WebStarter\\wwwroot\\", "BasePath": "_content/WebStarter", "RelativePath": "20240524/0.png", "AssetKind": "All",