diff --git a/WcsMain/ApiServe/Controllers/ThreeDController/TaskController.cs b/WcsMain/ApiServe/Controllers/ThreeDController/TaskController.cs index 7b0fd62..54f8d44 100644 --- a/WcsMain/ApiServe/Controllers/ThreeDController/TaskController.cs +++ b/WcsMain/ApiServe/Controllers/ThreeDController/TaskController.cs @@ -9,21 +9,19 @@ namespace WcsMain.ApiServe.Controllers.ThreeDController; [ApiController] public class TaskController(TaskService taskService) : ControllerBase { - private readonly TaskService _taskService = taskService; - /// /// 查询WMS任务 /// /// [HttpGet("getWmsTask")] - public WcsApiResponse> GetWmsTask() => _taskService.GetWmsTask(); + public WcsApiResponse> GetWmsTask() => taskService.GetWmsTask(); /// /// 查询WMS任务 /// /// [HttpGet("getWmsTaskNotEnd")] - public WcsApiResponse> GetWmsTaskNoEnd() => _taskService.GetWmsTaskNoEnd(); + public WcsApiResponse> GetWmsTaskNoEnd() => taskService.GetWmsTaskNoEnd(); /// /// 根据 plcId 查询任务 @@ -31,5 +29,5 @@ public class TaskController(TaskService taskService) : ControllerBase /// /// [HttpGet("queryRunningTask")] - public WcsApiResponse GetWcsTask([FromQuery(Name = "plcId")] int? plcId) => _taskService.GetWcsTask(plcId); + public WcsApiResponse GetWcsTask([FromQuery(Name = "plcId")] int? plcId) => taskService.GetWcsTask(plcId); } \ No newline at end of file diff --git a/WcsMain/ApiServe/Controllers/WcsController/ApiAcceptController.cs b/WcsMain/ApiServe/Controllers/WcsController/ApiAcceptController.cs index 9e139fd..5b4cf60 100644 --- a/WcsMain/ApiServe/Controllers/WcsController/ApiAcceptController.cs +++ b/WcsMain/ApiServe/Controllers/WcsController/ApiAcceptController.cs @@ -13,12 +13,10 @@ namespace WcsMain.ApiServe.Controllers.WcsController; public class ApiAcceptController(ApiAcceptService apiAcceptService) : ControllerBase { - private readonly ApiAcceptService _apiAcceptService = apiAcceptService; - /// /// 查询所有的WCS任务 /// /// [HttpPost("getApiAcceptWithPage")] - public WcsApiResponse> GetApiAcceptWithPage([FromBody] GetApiAcceptWithPageRequest request) => _apiAcceptService.GetApiAcceptWithPage(request); + public WcsApiResponse> GetApiAcceptWithPage([FromBody] GetApiAcceptWithPageRequest request) => apiAcceptService.GetApiAcceptWithPage(request); } \ No newline at end of file diff --git a/WcsMain/ApiServe/Controllers/WcsController/ApiRequestController.cs b/WcsMain/ApiServe/Controllers/WcsController/ApiRequestController.cs index aae2360..3e8ba9d 100644 --- a/WcsMain/ApiServe/Controllers/WcsController/ApiRequestController.cs +++ b/WcsMain/ApiServe/Controllers/WcsController/ApiRequestController.cs @@ -13,20 +13,18 @@ namespace WcsMain.ApiServe.Controllers.WcsController; public class ApiRequestController(ApiRequestService apiRequestService) : ControllerBase { - private readonly ApiRequestService _apiRequestService = apiRequestService; - /// /// 查询所有的WCS请求其他系统的记录 /// /// [HttpGet("getApiRequest")] - public WcsApiResponse> GetApiRequest() => _apiRequestService.GetApiRequest(); + public WcsApiResponse> GetApiRequest() => apiRequestService.GetApiRequest(); /// /// 查询所有的WCS任务 /// /// [HttpPost("getApiRequestWithPage")] - public WcsApiResponse> GetApiRequestWithPage([FromBody] GetApiRequestWithPageRequest request) => _apiRequestService.GetApiRequestWithPage(request); + public WcsApiResponse> GetApiRequestWithPage([FromBody] GetApiRequestWithPageRequest request) => apiRequestService.GetApiRequestWithPage(request); } \ No newline at end of file diff --git a/WcsMain/ApiServe/Controllers/WcsController/ConfigController.cs b/WcsMain/ApiServe/Controllers/WcsController/ConfigController.cs index 58733ec..c8d1f2e 100644 --- a/WcsMain/ApiServe/Controllers/WcsController/ConfigController.cs +++ b/WcsMain/ApiServe/Controllers/WcsController/ConfigController.cs @@ -13,15 +13,13 @@ namespace WcsMain.ApiServe.Controllers.WcsController; public class ConfigController(ConfigService configService) : ControllerBase { - private readonly ConfigService _configService = configService; - /// /// 查询配置项 /// /// /// [HttpGet("getConfig")] - public WcsApiResponse> GetConfig([FromQuery(Name = "configKey")] string? configKey) => _configService.GetConfig(configKey); + public WcsApiResponse> GetConfig([FromQuery(Name = "configKey")] string? configKey) => configService.GetConfig(configKey); /// /// 分页请求，获取配置项 @@ -29,7 +27,7 @@ public class ConfigController(ConfigService configService) : ControllerBase /// /// [HttpPost("getConfigWithPage")] - public WcsApiResponse> GetConfigWithPage([FromBody] GetConfigWithPageRequest request) => _configService.GetConfigWithPage(request); + public WcsApiResponse> GetConfigWithPage([FromBody] GetConfigWithPageRequest request) => configService.GetConfigWithPage(request); /// /// 添加或者修改配置项 @@ -37,5 +35,5 @@ public class ConfigController(ConfigService configService) : ControllerBase /// /// [HttpPost("editeConfig")] - public WcsApiResponse EditeConfig([FromBody] EditeConfigRequest request) => _configService.EditeConfig(request); + public WcsApiResponse EditeConfig([FromBody] EditeConfigRequest request) => configService.EditeConfig(request); } \ No newline at end of file diff --git a/WcsMain/ApiServe/Controllers/WcsController/ConveyTaskController.cs b/WcsMain/ApiServe/Controllers/WcsController/ConveyTaskController.cs index 667cc8d..720833e 100644 --- a/WcsMain/ApiServe/Controllers/WcsController/ConveyTaskController.cs +++ b/WcsMain/ApiServe/Controllers/WcsController/ConveyTaskController.cs @@ -16,14 +16,13 @@ namespace WcsMain.ApiServe.Controllers.WcsController; [WcsExceptionFilter] public class ConveyTaskController(ConveyService conveyService) : ControllerBase { - private readonly ConveyService _conveyService = conveyService; /// /// 分页查询箱式线任务 /// /// [HttpPost("queryConveyTaskWithPage")] - public WcsApiResponse> QueryConveyTaskWithPage([FromBody] QueryConveyTaskWithPageRequest request) => _conveyService.QueryConveyTaskWithPage(request); + public WcsApiResponse> QueryConveyTaskWithPage([FromBody] QueryConveyTaskWithPageRequest request) => conveyService.QueryConveyTaskWithPage(request); diff --git a/WcsMain/ApiServe/Controllers/WcsController/ElTagController.cs b/WcsMain/ApiServe/Controllers/WcsController/ElTagController.cs index 4cb4045..b424a21 100644 --- a/WcsMain/ApiServe/Controllers/WcsController/ElTagController.cs +++ b/WcsMain/ApiServe/Controllers/WcsController/ElTagController.cs @@ -19,19 +19,13 @@ namespace WcsMain.ApiServe.Controllers.WcsController; public class ElTagController(ElTagService elTagService) : ControllerBase { - private readonly ElTagService _elTagService = elTagService; - /// /// 向标签发送显示数字 /// /// /// [HttpPost("showNum")] - public WcsApiResponse ShowNum([FromBody] ShowNumRequest request) - { - return _elTagService.ShowNum(request); - } - + public WcsApiResponse ShowNum([FromBody] ShowNumRequest request) => elTagService.ShowNum(request); /// /// 分页查询电子标签任务表 @@ -39,10 +33,7 @@ public class ElTagController(ElTagService elTagService) : ControllerBase /// /// [HttpPost("queryTaskWithPage")] - public WcsApiResponse> QueryTaskWithPage([FromBody] QueryTaskRequest request) - { - return _elTagService.QueryTaskWithPage(request); - } + public WcsApiResponse> QueryTaskWithPage([FromBody] QueryTaskRequest request) => elTagService.QueryTaskWithPage(request); /// /// 编辑电子标签任务信息 @@ -50,11 +41,7 @@ public class ElTagController(ElTagService elTagService) : ControllerBase /// /// [HttpPost("editTaskInfo")] - public WcsApiResponse EditTaskInfo([FromBody] EditTaskInfoRequest request) - { - return _elTagService.EditTaskInfo(request); - } - + public WcsApiResponse EditTaskInfo([FromBody] EditTaskInfoRequest request) => elTagService.EditTaskInfo(request); /// /// 添加一个电子标签任务信息 @@ -62,10 +49,7 @@ public class ElTagController(ElTagService elTagService) : ControllerBase /// /// [HttpPost("addTask")] - public WcsApiResponse AddTaskInfo([FromBody] AddTaskInfoRequest request) - { - return _elTagService.AddTaskInfo(request); - } + public WcsApiResponse AddTaskInfo([FromBody] AddTaskInfoRequest request) => elTagService.AddTaskInfo(request); /// /// 分页查询电子标签库位表 @@ -73,9 +57,6 @@ public class ElTagController(ElTagService elTagService) : ControllerBase /// /// [HttpPost("queryLocationWithPage")] - public WcsApiResponse> QueryLocationWithPage([FromBody] QueryLocationWithPageRequest request) - { - return _elTagService.QueryLocationWithPage(request); - } + public WcsApiResponse> QueryLocationWithPage([FromBody] QueryLocationWithPageRequest request) => elTagService.QueryLocationWithPage(request); } diff --git a/WcsMain/ApiServe/Controllers/WcsController/EquipmentController.cs b/WcsMain/ApiServe/Controllers/WcsController/EquipmentController.cs index 570225b..8503c83 100644 --- a/WcsMain/ApiServe/Controllers/WcsController/EquipmentController.cs +++ b/WcsMain/ApiServe/Controllers/WcsController/EquipmentController.cs @@ -16,18 +16,16 @@ namespace WcsMain.ApiServe.Controllers.WcsController; public class EquipmentController(EquipmentService equipmentService) : ControllerBase { - private readonly EquipmentService _equipmentService = equipmentService; - [HttpGet("queryStackerInfo")] - public WcsApiResponse> GetStackerInfo() => _equipmentService.GetStackerInfo(); + public WcsApiResponse> GetStackerInfo() => equipmentService.GetStackerInfo(); /// /// 查询库前输送机信息 /// /// [HttpGet("queryStackerConveyInfo")] - public WcsApiResponse> GetConveyInfo() => _equipmentService.GetConveyInfo(); + public WcsApiResponse> GetConveyInfo() => equipmentService.GetConveyInfo(); /// @@ -36,7 +34,7 @@ public class EquipmentController(EquipmentService equipmentService) : Controller /// /// [HttpPost("resetStacker")] - public WcsApiResponse ResetStacker([FromBody] ResetStackerRequest request) => _equipmentService.ResetStacker(request); + public WcsApiResponse ResetStacker([FromBody] ResetStackerRequest request) => equipmentService.ResetStacker(request); /// /// 堆垛机继续运行 @@ -44,5 +42,5 @@ public class EquipmentController(EquipmentService equipmentService) : Controller /// /// [HttpPost("stackerContinue")] - public WcsApiResponse StackerContinue([FromBody] StackerContinueRequest request) => _equipmentService.StackerContinue(request); + public WcsApiResponse StackerContinue([FromBody] StackerContinueRequest request) => equipmentService.StackerContinue(request); } \ No newline at end of file diff --git a/WcsMain/ApiServe/Controllers/WcsController/LocationController.cs b/WcsMain/ApiServe/Controllers/WcsController/LocationController.cs index beb8915..9be1fcf 100644 --- a/WcsMain/ApiServe/Controllers/WcsController/LocationController.cs +++ b/WcsMain/ApiServe/Controllers/WcsController/LocationController.cs @@ -13,27 +13,19 @@ namespace WcsMain.ApiServe.Controllers.WcsController; public class LocationController(LocationService locationService) : ControllerBase { - private readonly LocationService _locationService = locationService; - /// /// 查询所有的点位状态 /// /// [HttpGet("getLocation")] - public WcsApiResponse> GetLocation() - { - return _locationService.GetLocation(); - } + public WcsApiResponse> GetLocation() => locationService.GetLocation(); /// /// 分页查询所有的点位状态 /// /// [HttpPost("getLocationWithPage")] - public WcsApiResponse> GetLocationWithPage([FromBody] GetLocationWithPageRequest request) - { - return _locationService.GetLocationWithPage(request); - } + public WcsApiResponse> GetLocationWithPage([FromBody] GetLocationWithPageRequest request) => locationService.GetLocationWithPage(request); /// /// 更新点位信息 @@ -41,8 +33,6 @@ public class LocationController(LocationService locationService) : ControllerBas /// /// [HttpPost("updateLocation")] - public WcsApiResponse UpdateLocation([FromBody] UpdateLocationRequest request) - { - return _locationService.UpdateLocation(request); - } + public WcsApiResponse UpdateLocation([FromBody] UpdateLocationRequest request) => locationService.UpdateLocation(request); + } \ No newline at end of file diff --git a/WcsMain/ApiServe/Controllers/WcsController/MenuController.cs b/WcsMain/ApiServe/Controllers/WcsController/MenuController.cs index 8610a4a..5664af3 100644 --- a/WcsMain/ApiServe/Controllers/WcsController/MenuController.cs +++ b/WcsMain/ApiServe/Controllers/WcsController/MenuController.cs @@ -13,18 +13,13 @@ namespace WcsMain.ApiServe.Controllers.WcsController; public class MenuController(MenuService menuService) : ControllerBase { - private readonly MenuService _menuService = menuService; - /// /// ҳѯ˵ /// /// /// [HttpPost("getMenuWithPage")] - public WcsApiResponse> GetMenuWithPage([FromBody] GetMenuWithPageRequest request) - { - return _menuService.GetMenuWithPage(request); - } + public WcsApiResponse> GetMenuWithPage([FromBody] GetMenuWithPageRequest request) => menuService.GetMenuWithPage(request); /// /// ²˵Ϣ @@ -32,10 +27,7 @@ public class MenuController(MenuService menuService) : ControllerBase /// /// [HttpPost("updateMenu")] - public WcsApiResponse UpdateMenu([FromBody] UpdateMenuRequest request) - { - return _menuService.UpdateMenu(request); - } + public WcsApiResponse UpdateMenu([FromBody] UpdateMenuRequest request) => menuService.UpdateMenu(request); /// /// Ӳ˵Ϣ @@ -43,10 +35,6 @@ public class MenuController(MenuService menuService) : ControllerBase /// /// [HttpPost("addMenu")] - public WcsApiResponse AddMenu([FromBody] AddMenuRequest request) - { - return _menuService.AddMenu(request); - } - + public WcsApiResponse AddMenu([FromBody] AddMenuRequest request) => menuService.AddMenu(request); } \ No newline at end of file diff --git a/WcsMain/ApiServe/Controllers/WcsController/PlcController.cs b/WcsMain/ApiServe/Controllers/WcsController/PlcController.cs index f9e7c41..2efa9a6 100644 --- a/WcsMain/ApiServe/Controllers/WcsController/PlcController.cs +++ b/WcsMain/ApiServe/Controllers/WcsController/PlcController.cs @@ -13,17 +13,12 @@ namespace WcsMain.ApiServe.Controllers.WcsController; public class PlcController(PlcService plcService) : ControllerBase { - private readonly PlcService _plcService = plcService; - /// /// 查询plc /// /// [HttpGet("getPlc")] - public WcsApiResponse> GetPlc() - { - return _plcService.GetPlc(); - } + public WcsApiResponse> GetPlc() => plcService.GetPlc(); /// /// 添加或者修改配置项 @@ -31,11 +26,7 @@ public class PlcController(PlcService plcService) : ControllerBase /// /// [HttpPost("editePlc")] - public WcsApiResponse EditePlc([FromBody] EditePLCRequest request) - { - return _plcService.EditePlc(request); - } - + public WcsApiResponse EditePlc([FromBody] EditePLCRequest request) => plcService.EditePlc(request); /// /// 添加或者修改配置项 @@ -43,8 +34,6 @@ public class PlcController(PlcService plcService) : ControllerBase /// /// [HttpDelete("deletePlc")] - public WcsApiResponse DeletePlc([FromQuery(Name = "plcId")] int? plcId) - { - return _plcService.DeletePlc(plcId); - } + public WcsApiResponse DeletePlc([FromQuery(Name = "plcId")] int? plcId) => plcService.DeletePlc(plcId); + } \ No newline at end of file diff --git a/WcsMain/ApiServe/Controllers/WcsController/PlcDbController.cs b/WcsMain/ApiServe/Controllers/WcsController/PlcDbController.cs index 9638317..2f7dcd7 100644 --- a/WcsMain/ApiServe/Controllers/WcsController/PlcDbController.cs +++ b/WcsMain/ApiServe/Controllers/WcsController/PlcDbController.cs @@ -13,18 +13,12 @@ namespace WcsMain.ApiServe.Controllers.WcsController; public class PlcDbController(PlcDbService plcDbService) : ControllerBase { - private readonly PlcDbService _plcDbService = plcDbService; - /// /// 查询 db /// /// [HttpGet("getDB")] - public WcsApiResponse> GetDB() - { - return _plcDbService.GetDB(); - } - + public WcsApiResponse> GetDB() => plcDbService.GetDB(); /// /// 添加或者修改db项 @@ -32,10 +26,7 @@ public class PlcDbController(PlcDbService plcDbService) : ControllerBase /// /// [HttpPost("addOrUpdate")] - public WcsApiResponse EditeDB([FromBody] EditeDBRequest request) - { - return _plcDbService.EditePlc(request); - } + public WcsApiResponse EditeDB([FromBody] EditeDBRequest request) => plcDbService.EditePlc(request); /// /// 删除一个DB信息 @@ -43,10 +34,7 @@ public class PlcDbController(PlcDbService plcDbService) : ControllerBase /// /// [HttpDelete("deleteDB")] - public WcsApiResponse DeleteDb([FromQuery(Name = "dbName")] string? dbName) - { - return _plcDbService.DeleteDB(dbName); - } + public WcsApiResponse DeleteDb([FromQuery(Name = "dbName")] string? dbName) => plcDbService.DeleteDB(dbName); /// /// 查询 db 同时返回 PLC名称 @@ -54,9 +42,6 @@ public class PlcDbController(PlcDbService plcDbService) : ControllerBase /// /// [HttpPost("getDBWithPlcName")] - public WcsApiResponse> GetDBWithPlcName(GetDBWithPlcNameRequest request) - { - return _plcDbService.GetDBWithPlcName(request); - } + public WcsApiResponse> GetDBWithPlcName(GetDBWithPlcNameRequest request) => plcDbService.GetDBWithPlcName(request); } \ No newline at end of file diff --git a/WcsMain/ApiServe/Controllers/WcsController/RunningInfoController.cs b/WcsMain/ApiServe/Controllers/WcsController/RunningInfoController.cs index 838ec90..c0cdbd9 100644 --- a/WcsMain/ApiServe/Controllers/WcsController/RunningInfoController.cs +++ b/WcsMain/ApiServe/Controllers/WcsController/RunningInfoController.cs @@ -11,22 +11,13 @@ namespace WcsMain.ApiServe.Controllers.WcsController; [WcsExceptionFilter] public class RunningInfoController(RunningInfoService runningInfoService) : ControllerBase { - - - private readonly RunningInfoService _runningInfoService = runningInfoService; - - /// /// 获取日志的文件名称 /// /// /// [HttpGet("getLogFileName")] - public WcsApiResponse> GetLogFileName([FromQuery(Name = "logType")] string? logType) - { - return _runningInfoService.GetLogFileName(logType); - } - + public WcsApiResponse> GetLogFileName([FromQuery(Name = "logType")] string? logType) => runningInfoService.GetLogFileName(logType); /// /// 验证下载文件是否存在 @@ -34,11 +25,7 @@ public class RunningInfoController(RunningInfoService runningInfoService) : Cont /// /// [HttpPost("checkDownLoadLog")] - public WcsApiResponse CheckDownLoadLog([FromBody] LogRequest request) - { - return _runningInfoService.CheckDownLoadLog(request); - } - + public WcsApiResponse CheckDownLoadLog([FromBody] LogRequest request) => runningInfoService.CheckDownLoadLog(request); /// /// 下载文件 @@ -46,10 +33,7 @@ public class RunningInfoController(RunningInfoService runningInfoService) : Cont /// /// [HttpPost("downLoadLog")] - public FileContentResult DownLoadLog([FromBody] LogRequest request) - { - return _runningInfoService.DownLoadLog(request, this); - } + public FileContentResult DownLoadLog([FromBody] LogRequest request) => runningInfoService.DownLoadLog(request, this); } \ No newline at end of file diff --git a/WcsMain/ApiServe/Controllers/WcsController/SettingController.cs b/WcsMain/ApiServe/Controllers/WcsController/SettingController.cs index 1ddffbc..0c845b0 100644 --- a/WcsMain/ApiServe/Controllers/WcsController/SettingController.cs +++ b/WcsMain/ApiServe/Controllers/WcsController/SettingController.cs @@ -10,21 +10,13 @@ namespace WcsMain.ApiServe.Controllers.WcsController; [ApiController] public class SettingController(SettingService settingService) : ControllerBase { - - private readonly SettingService _settingService = settingService; - /// /// 查询设置项 /// /// /// [HttpGet("getSettings")] - public WcsApiResponse> GetConfig([FromQuery(Name = "settingKey")] string? settingKey) - { - return _settingService.GetConfig(settingKey); - } - - + public WcsApiResponse> GetConfig([FromQuery(Name = "settingKey")] string? settingKey) => settingService.GetConfig(settingKey); /// /// 添加或者修改配置项 @@ -32,8 +24,6 @@ public class SettingController(SettingService settingService) : ControllerBase /// /// [HttpPost("editSettings")] - public WcsApiResponse EditeConfig([FromBody] EditSettingsRequest request) - { - return _settingService.EditeConfig(request); - } + public WcsApiResponse EditeConfig([FromBody] EditSettingsRequest request) => settingService.EditeConfig(request); + } \ No newline at end of file diff --git a/WcsMain/ApiServe/Controllers/WcsController/SocketController.cs b/WcsMain/ApiServe/Controllers/WcsController/SocketController.cs index 81c45c5..132a2fd 100644 --- a/WcsMain/ApiServe/Controllers/WcsController/SocketController.cs +++ b/WcsMain/ApiServe/Controllers/WcsController/SocketController.cs @@ -1,4 +1,5 @@ using Microsoft.AspNetCore.Mvc; +using WcsMain.ApiServe.ControllerFilter.ExceptionFilter; using WcsMain.ApiServe.Controllers.Dto; using WcsMain.ApiServe.Controllers.Dto.WcsDto.Socket; using WcsMain.ApiServe.Service.WcsService; @@ -8,21 +9,15 @@ namespace WcsMain.ApiServe.Controllers.WcsController; [Route("api/wcs/socket")] [ApiController] +[WcsExceptionFilter] public class SocketController(SocketService socketService) : ControllerBase { - - private readonly SocketService _socketService = socketService; - /// /// 查询 socket 连接信息 /// /// [HttpGet("getSocket")] - public WcsApiResponse> GetDB() - { - return _socketService.GetDB(); - } - + public WcsApiResponse> GetDB() => socketService.GetDB(); /// /// 编辑 socket @@ -30,10 +25,7 @@ public class SocketController(SocketService socketService) : ControllerBase /// /// [HttpPost("editSocket")] - public WcsApiResponse EditSocket([FromBody] EditSocketRequest request) - { - return _socketService.EditSocket(request); - } + public WcsApiResponse EditSocket([FromBody] EditSocketRequest request) => socketService.EditSocket(request); /// /// 删除一条信息 @@ -41,8 +33,6 @@ public class SocketController(SocketService socketService) : ControllerBase /// /// [HttpDelete("deleteSocket")] - public WcsApiResponse DeleteSocket([FromQuery(Name = "socketNo")] string? socketNoStr) - { - return _socketService.DeleteSocket(socketNoStr); - } + public WcsApiResponse DeleteSocket([FromQuery(Name = "socketNo")] string? socketNoStr) => socketService.DeleteSocket(socketNoStr); + } \ No newline at end of file diff --git a/WcsMain/ApiServe/Controllers/WcsController/StackerController.cs b/WcsMain/ApiServe/Controllers/WcsController/StackerController.cs index 3502fa0..e493f10 100644 --- a/WcsMain/ApiServe/Controllers/WcsController/StackerController.cs +++ b/WcsMain/ApiServe/Controllers/WcsController/StackerController.cs @@ -12,29 +12,19 @@ namespace WcsMain.ApiServe.Controllers.WcsController; [WcsExceptionFilter] public class StackerController(StackerService stackerService) : ControllerBase { - - private readonly StackerService _stackerService = stackerService; - - /// /// 查询所有的 堆垛机信息 /// /// [HttpGet("getStacker")] - public WcsApiResponse> GetStacker() - { - return _stackerService.GetStacker(); - } + public WcsApiResponse> GetStacker() => stackerService.GetStacker(); /// /// 查询所有的 堆垛机状态信息 ---- 从设备返回 /// /// [HttpGet("getStackerStatus")] - public WcsApiResponse> GetStackerStatus() - { - return _stackerService.GetStackerStatus(); - } + public WcsApiResponse> GetStackerStatus() => stackerService.GetStackerStatus(); /// /// 添加或者编辑堆垛机信息 @@ -42,8 +32,6 @@ public class StackerController(StackerService stackerService) : ControllerBase /// /// [HttpPost("editStacker")] - public WcsApiResponse EditStacker([FromBody] EditStackerRequest request) - { - return _stackerService.EditStacker(request); - } + public WcsApiResponse EditStacker([FromBody] EditStackerRequest request) => stackerService.EditStacker(request); + } \ No newline at end of file diff --git a/WcsMain/ApiServe/Controllers/WcsController/UserController.cs b/WcsMain/ApiServe/Controllers/WcsController/UserController.cs index b2a3a13..2396724 100644 --- a/WcsMain/ApiServe/Controllers/WcsController/UserController.cs +++ b/WcsMain/ApiServe/Controllers/WcsController/UserController.cs @@ -12,9 +12,6 @@ namespace WcsMain.ApiServe.Controllers.WcsController; [WcsExceptionFilter] public class UserController(UserService userService) : ControllerBase { - private readonly UserService _userService = userService; - - /// /// 用户登录 /// @@ -24,10 +21,7 @@ public class UserController(UserService userService) : ControllerBase /// 若登录成功则返回用户名和用户菜单 /// [HttpPost("login")] - public WcsApiResponse Login([FromBody] LoginRequest request) - { - return _userService.Login(request); - } + public WcsApiResponse Login([FromBody] LoginRequest request) => userService.Login(request); /// /// 分页查询所有用户信息 @@ -35,10 +29,6 @@ public class UserController(UserService userService) : ControllerBase /// /// [HttpPost("getUserWithPage")] - public WcsApiResponse> GetUserWithPage([FromBody] GetUserWithPageRequest request) - { - return _userService.GetUserWithPage(request); - } - + public WcsApiResponse> GetUserWithPage([FromBody] GetUserWithPageRequest request) => userService.GetUserWithPage(request); } \ No newline at end of file diff --git a/WcsMain/ApiServe/Controllers/WcsController/UserGroupController.cs b/WcsMain/ApiServe/Controllers/WcsController/UserGroupController.cs index fa9fd8c..e0ebe3d 100644 --- a/WcsMain/ApiServe/Controllers/WcsController/UserGroupController.cs +++ b/WcsMain/ApiServe/Controllers/WcsController/UserGroupController.cs @@ -11,18 +11,12 @@ namespace WcsMain.ApiServe.Controllers.WcsController; public class UserGroupController(UserGroupService userGroupService) : ControllerBase { - - private readonly UserGroupService _userGroupService = userGroupService; - /// /// ѯû /// /// [HttpGet("getUserGroup")] - public WcsApiResponse> GetUserGroup() - { - return _userGroupService.GetUserGroup(); - } + public WcsApiResponse> GetUserGroup() => userGroupService.GetUserGroup(); /// /// û @@ -30,10 +24,7 @@ public class UserGroupController(UserGroupService userGroupService) : Controller /// /// [HttpPost("addUserGroup")] - public WcsApiResponse AddUserGroup([FromBody] AddUserGroupRequest request) - { - return _userGroupService.AddUserGroup(request); - } + public WcsApiResponse AddUserGroup([FromBody] AddUserGroupRequest request) => userGroupService.AddUserGroup(request); /// /// ɾû @@ -41,10 +32,6 @@ public class UserGroupController(UserGroupService userGroupService) : Controller /// /// [HttpDelete("deleteUserGroup")] - public WcsApiResponse DeleteUserGroup([FromQuery] string? groupId) - { - return _userGroupService.DeleteUserGroup(groupId); - } - + public WcsApiResponse DeleteUserGroup([FromQuery] string? groupId) => userGroupService.DeleteUserGroup(groupId); } \ No newline at end of file diff --git a/WcsMain/ApiServe/Controllers/WcsController/UserRuleController.cs b/WcsMain/ApiServe/Controllers/WcsController/UserRuleController.cs index f1259a0..c747131 100644 --- a/WcsMain/ApiServe/Controllers/WcsController/UserRuleController.cs +++ b/WcsMain/ApiServe/Controllers/WcsController/UserRuleController.cs @@ -12,19 +12,12 @@ namespace WcsMain.ApiServe.Controllers.WcsController; [WcsExceptionFilter] public class UserRuleController(UserRuleService userRuleService) : ControllerBase { - - - private readonly UserRuleService _userRuleService = userRuleService; - /// /// ȡûȨ /// /// [HttpGet("getUserRule")] - public WcsApiResponse> GetUserRule([FromQuery] string? groupId) - { - return _userRuleService.GetUserRule(groupId); - } + public WcsApiResponse> GetUserRule([FromQuery] string? groupId) => userRuleService.GetUserRule(groupId); /// /// ûȨ @@ -32,8 +25,6 @@ public class UserRuleController(UserRuleService userRuleService) : ControllerBas /// /// [HttpPost("updateUserRule")] - public WcsApiResponse UpdateUserRule([FromBody] UpdateUserRuleRequest request) - { - return _userRuleService.UpdateUserRule(request); - } + public WcsApiResponse UpdateUserRule([FromBody] UpdateUserRuleRequest request) => userRuleService.UpdateUserRule(request); + } \ No newline at end of file diff --git a/WcsMain/ApiServe/Controllers/WcsController/WcsTaskController.cs b/WcsMain/ApiServe/Controllers/WcsController/WcsTaskController.cs index 25a4262..a074d0e 100644 --- a/WcsMain/ApiServe/Controllers/WcsController/WcsTaskController.cs +++ b/WcsMain/ApiServe/Controllers/WcsController/WcsTaskController.cs @@ -12,10 +12,6 @@ namespace WcsMain.ApiServe.Controllers.WcsController; [WcsExceptionFilter] public class WcsTaskController(WcsTaskService wcsTaskService) : ControllerBase { - - private readonly WcsTaskService _wcsTaskService = wcsTaskService; - - /// /// 查询所有的正在运行的WCS任务 /// @@ -23,7 +19,7 @@ public class WcsTaskController(WcsTaskService wcsTaskService) : ControllerBase [HttpGet("getWcsTask")] public WcsApiResponse> GetWcsTask() { - return _wcsTaskService.GetWcsTask(); + return wcsTaskService.GetWcsTask(); } /// @@ -32,10 +28,7 @@ public class WcsTaskController(WcsTaskService wcsTaskService) : ControllerBase /// /// [HttpGet("getWcsTaskWithTaskId")] - public WcsApiResponse> GetWcsTaskWithTaskId([FromQuery(Name = "taskId")] string taskId) - { - return _wcsTaskService.GetWcsTaskWithTaskId(taskId); - } + public WcsApiResponse> GetWcsTaskWithTaskId([FromQuery(Name = "taskId")] string taskId) => wcsTaskService.GetWcsTaskWithTaskId(taskId); /// /// 分页查询正在运行的任务 @@ -43,10 +36,8 @@ public class WcsTaskController(WcsTaskService wcsTaskService) : ControllerBase /// /// [HttpPost("getWcsTaskWithPage")] - public WcsApiResponse> GetWcsTaskWithPage([FromBody] GetWcsTaskWithPageRequest request) - { - return _wcsTaskService.GetWcsTaskWithPage(request); - } + public WcsApiResponse> GetWcsTaskWithPage([FromBody] GetWcsTaskWithPageRequest request) => wcsTaskService.GetWcsTaskWithPage(request); + /// /// 更新任务信息 @@ -54,8 +45,6 @@ public class WcsTaskController(WcsTaskService wcsTaskService) : ControllerBase /// /// [HttpPost("updateStatus")] - public WcsApiResponse UpdateWcsTaskStatus([FromBody] UpdateWcsTaskStatusRequest request) - { - return _wcsTaskService.UpdateWcsTaskStatus(request); - } + public WcsApiResponse UpdateWcsTaskStatus([FromBody] UpdateWcsTaskStatusRequest request) => wcsTaskService.UpdateWcsTaskStatus(request); + } \ No newline at end of file diff --git a/WcsMain/ApiServe/Controllers/WcsController/WmsTaskController.cs b/WcsMain/ApiServe/Controllers/WcsController/WmsTaskController.cs index a2ef376..1c52526 100644 --- a/WcsMain/ApiServe/Controllers/WcsController/WmsTaskController.cs +++ b/WcsMain/ApiServe/Controllers/WcsController/WmsTaskController.cs @@ -13,27 +13,19 @@ namespace WcsMain.ApiServe.Controllers.WcsController; [WcsExceptionFilter] public class WmsTaskController(WmsTaskService wmsTaskService) : ControllerBase { - private readonly WmsTaskService _wmsTaskService = wmsTaskService; - /// /// 查询WMS任务 /// /// [HttpGet("getWmsTask")] - public WcsApiResponse> GetWmsTask() - { - return _wmsTaskService.GetWmsTask(); - } + public WcsApiResponse> GetWmsTask() => wmsTaskService.GetWmsTask(); /// /// 分页查询所有的Wms任务 /// /// [HttpPost("getWmsTaskWithPage")] - public WcsApiResponse> GetWmsTaskWithPage([FromBody] GetWmsTaskWithPageRequest request) - { - return _wmsTaskService.GetWmsTaskWithPage(request); - } + public WcsApiResponse> GetWmsTaskWithPage([FromBody] GetWmsTaskWithPageRequest request) => wmsTaskService.GetWmsTaskWithPage(request); /// /// wcs前端向Wcs发送任务 @@ -41,10 +33,7 @@ public class WmsTaskController(WmsTaskService wmsTaskService) : ControllerBase /// /// [HttpPost("setStackerTask")] - public WcsApiResponse GetStackerTask([FromBody] SetWmsTask request) - { - return _wmsTaskService.GetStackerTask(request); - } + public WcsApiResponse GetStackerTask([FromBody] SetWmsTask request) => wmsTaskService.GetStackerTask(request); /// /// Wms向Wcs请求修改任务状态 @@ -52,9 +41,6 @@ public class WmsTaskController(WmsTaskService wmsTaskService) : ControllerBase /// /// [HttpPost("updateWmsTaskStatus")] - public WcsApiResponse UpdateStackerTaskStatus([FromBody] UpdateStackerTaskStatusRequest request) - { - return _wmsTaskService.UpdateStackerTaskStatus(request); - } + public WcsApiResponse UpdateStackerTaskStatus([FromBody] UpdateStackerTaskStatusRequest request) => wmsTaskService.UpdateStackerTaskStatus(request); } \ No newline at end of file diff --git a/WcsMain/ApiServe/Controllers/WmsController/ConveyController.cs b/WcsMain/ApiServe/Controllers/WmsController/ConveyController.cs index 8c0d2e2..b8628fd 100644 --- a/WcsMain/ApiServe/Controllers/WmsController/ConveyController.cs +++ b/WcsMain/ApiServe/Controllers/WmsController/ConveyController.cs @@ -12,18 +12,20 @@ namespace WcsMain.ApiServe.Controllers.WmsController; [WmsApiExceptionFilter] public class ConveyController(ConveyService conveyService) : ControllerBase { - - private readonly ConveyService _conveyService = conveyService; - /// /// 接受上位系统发送过来的输送任务 /// /// /// [HttpPost("conveyTask")] - public WmsApiResponse GetConveyTask([FromBody] GetConveyTaskRequest request) => _conveyService.GetConveyTask(request); + public WmsApiResponse GetConveyTask([FromBody] GetConveyTaskRequest request) => conveyService.GetConveyTask(request); + /// + /// 释放站台，放箱子离开 + /// + /// + /// [HttpPost("disposeVehicle")] - public WmsApiResponse DisposeVehicle([FromBody] DisposeVehicleRequest request) => _conveyService.DisposeVehicle(request); + public WmsApiResponse DisposeVehicle([FromBody] DisposeVehicleRequest request) => conveyService.DisposeVehicle(request); } diff --git a/WcsMain/ApiServe/Controllers/WmsController/ElTagController.cs b/WcsMain/ApiServe/Controllers/WmsController/ElTagController.cs index 942947a..716f65e 100644 --- a/WcsMain/ApiServe/Controllers/WmsController/ElTagController.cs +++ b/WcsMain/ApiServe/Controllers/WmsController/ElTagController.cs @@ -17,20 +17,12 @@ namespace WcsMain.ApiServe.Controllers.WmsController; [WmsApiExceptionFilter] public class ElTagController(ElTagService elTagService) : ControllerBase { - - private readonly ElTagService _elTagService = elTagService; - /// /// 接收 上位系统发来的 电子标签任务 /// /// /// [HttpPost("elTagTask")] - public WmsApiResponse GetElTagTask([FromBody] GetElTagTaskRequest request) - { - return _elTagService.GetElTagTask(request); - } - - + public WmsApiResponse GetElTagTask([FromBody] GetElTagTaskRequest request) => elTagService.GetElTagTask(request); } diff --git a/WcsMain/ApiServe/Controllers/WmsController/EquipmentController.cs b/WcsMain/ApiServe/Controllers/WmsController/EquipmentController.cs index 87f5b25..15abce2 100644 --- a/WcsMain/ApiServe/Controllers/WmsController/EquipmentController.cs +++ b/WcsMain/ApiServe/Controllers/WmsController/EquipmentController.cs @@ -16,28 +16,20 @@ namespace WcsMain.ApiServe.Controllers.WmsController public class EquipmentController(EquipmentService equipmentService) : ControllerBase { - private readonly EquipmentService _equipmentService = equipmentService; - /// /// 查询站台是否允许动作 /// /// /// [HttpPost("queryStandStatus")] - public WmsApiResponse QueryStandStatus([FromBody] QueryStandStatusRequest request) - { - return _equipmentService.QueryStandStatus(request); - } + public WmsApiResponse QueryStandStatus([FromBody] QueryStandStatusRequest request) => equipmentService.QueryStandStatus(request); /// /// 通知输送机卸货完成 /// /// [HttpPost("unloadSuccess")] - public WmsApiResponse UnloadSuccess() - { - return _equipmentService.UnloadSuccess(); - } + public WmsApiResponse UnloadSuccess() => equipmentService.UnloadSuccess(); } } diff --git a/WcsMain/ApiServe/Controllers/WmsController/WmsTaskController.cs b/WcsMain/ApiServe/Controllers/WmsController/WmsTaskController.cs index c977e46..aee7a4f 100644 --- a/WcsMain/ApiServe/Controllers/WmsController/WmsTaskController.cs +++ b/WcsMain/ApiServe/Controllers/WmsController/WmsTaskController.cs @@ -16,20 +16,13 @@ namespace WcsMain.ApiServe.Controllers.WmsController; [WmsApiExceptionFilter] public class WmsTaskController(WmsTaskService wmsTaskService) : ControllerBase { - - private readonly WmsTaskService _wmsTaskService = wmsTaskService; - /// /// Wms向Wcs发送任务 /// /// /// [HttpPost("setStackerTask")] - public WmsApiResponse> GetStackerTask([FromBody] List request) - { - return _wmsTaskService.GetStackerTask(request); - } - + public WmsApiResponse> GetStackerTask([FromBody] List request) => wmsTaskService.GetStackerTask(request); /// /// Wms向Wcs请求修改任务状态 @@ -37,10 +30,7 @@ public class WmsTaskController(WmsTaskService wmsTaskService) : ControllerBase /// /// [HttpPost("changeTaskStatus")] - public WmsApiResponse UpdateStackerTaskStatus([FromBody] UpdateStackerTaskStatusRequest request) - { - return _wmsTaskService.UpdateStackerTaskStatus(request); - } + public WmsApiResponse UpdateStackerTaskStatus([FromBody] UpdateStackerTaskStatusRequest request) => wmsTaskService.UpdateStackerTaskStatus(request); /// /// WMS向WCS发送任务新终点，卸货位置有货的时候 @@ -48,13 +38,6 @@ public class WmsTaskController(WmsTaskService wmsTaskService) : ControllerBase /// /// [HttpPost("setStackerTaskNewDestination")] - public WmsApiResponse GetStackerTaskNewDestination([FromBody] GetStackerTaskNewDestinationRequest request) - { - return _wmsTaskService.GetStackerTaskNewDestination(request); - } - - - - + public WmsApiResponse GetStackerTaskNewDestination([FromBody] GetStackerTaskNewDestinationRequest request) => wmsTaskService.GetStackerTaskNewDestination(request); } \ No newline at end of file diff --git a/WcsMain/ApiServe/Service/TreeDService/TaskService.cs b/WcsMain/ApiServe/Service/TreeDService/TaskService.cs index d9f1d34..71eeef8 100644 --- a/WcsMain/ApiServe/Service/TreeDService/TaskService.cs +++ b/WcsMain/ApiServe/Service/TreeDService/TaskService.cs @@ -9,16 +9,13 @@ namespace WcsMain.ApiServe.Service.TreeDService; [Service] public class TaskService(AppWmsTaskDao wmsTaskDao, AppWcsTaskDao wcsTaskDao) { - private readonly AppWcsTaskDao _wcsTaskDao = wcsTaskDao; - private readonly AppWmsTaskDao _wmsTaskDao = wmsTaskDao; - /// /// 查询WMS任务 /// /// public WcsApiResponse> GetWmsTask() { - List? wmsTasks = _wmsTaskDao.SelectToWeb(); + List? wmsTasks = wmsTaskDao.SelectToWeb(); return WcsApiResponseFactory.Success(wmsTasks); } @@ -28,7 +25,7 @@ public class TaskService(AppWmsTaskDao wmsTaskDao, AppWcsTaskDao wcsTaskDao) /// public WcsApiResponse> GetWmsTaskNoEnd() { - List? wmsTasks = _wmsTaskDao.SelectWmsTaskNotEnd(); + List? wmsTasks = wmsTaskDao.SelectWmsTaskNotEnd(); return WcsApiResponseFactory.Success(wmsTasks); } @@ -43,7 +40,7 @@ public class TaskService(AppWmsTaskDao wmsTaskDao, AppWcsTaskDao wcsTaskDao) { return WcsApiResponseFactory.RequestErr(default, $"无法识别查询的 plcId ，值为：{plcId}"); } - List? queryResult = _wcsTaskDao.Select(new AppWcsTask() { PlcId = plcId }); + List? queryResult = wcsTaskDao.Select(new AppWcsTask() { PlcId = plcId }); if (queryResult == default || queryResult.Count < 1) { return WcsApiResponseFactory.Fail(default, $"未找到该 plcId 对应的任务，值为：{plcId}"); diff --git a/WcsMain/ApiServe/Service/WcsService/ApiAcceptService.cs b/WcsMain/ApiServe/Service/WcsService/ApiAcceptService.cs index d989832..e88ea9f 100644 --- a/WcsMain/ApiServe/Service/WcsService/ApiAcceptService.cs +++ b/WcsMain/ApiServe/Service/WcsService/ApiAcceptService.cs @@ -10,8 +10,6 @@ namespace WcsMain.ApiServe.Service.WcsService; [Service] public class ApiAcceptService(AppApiAcceptDao apiAcceptDao) { - private readonly AppApiAcceptDao _apiAcceptDao = apiAcceptDao; - /// /// 分页查询API接收记录 /// @@ -19,7 +17,7 @@ public class ApiAcceptService(AppApiAcceptDao apiAcceptDao) /// public WcsApiResponse> GetApiAcceptWithPage(GetApiAcceptWithPageRequest request) { - var (apiRequests, totalRows) = _apiAcceptDao.SelectPage(request); + var (apiRequests, totalRows) = apiAcceptDao.SelectPage(request); if(apiRequests == default) { return WcsApiResponseFactory.DataBaseErr>(); diff --git a/WcsMain/ApiServe/Service/WcsService/ApiRequestService.cs b/WcsMain/ApiServe/Service/WcsService/ApiRequestService.cs index adcf590..5ed415c 100644 --- a/WcsMain/ApiServe/Service/WcsService/ApiRequestService.cs +++ b/WcsMain/ApiServe/Service/WcsService/ApiRequestService.cs @@ -10,15 +10,13 @@ namespace WcsMain.ApiServe.Service.WcsService; [Service] public class ApiRequestService(AppApiRequestDao apiRequestDao) { - private readonly AppApiRequestDao _apiRequestDao = apiRequestDao; - /// /// 获取所有API请求记录 /// /// public WcsApiResponse> GetApiRequest() { - List? apiRequests = _apiRequestDao.Select(); + List? apiRequests = apiRequestDao.Select(); if(apiRequests == default) { return WcsApiResponseFactory.DataBaseErr>(); @@ -33,7 +31,7 @@ public class ApiRequestService(AppApiRequestDao apiRequestDao) /// public WcsApiResponse> GetApiRequestWithPage(GetApiRequestWithPageRequest request) { - var (apiRequests, totalRows) = _apiRequestDao.SelectPage(request); + var (apiRequests, totalRows) = apiRequestDao.SelectPage(request); if(apiRequests == default) { return WcsApiResponseFactory.DataBaseErr>(); diff --git a/WcsMain/ApiServe/Service/WcsService/ConfigService.cs b/WcsMain/ApiServe/Service/WcsService/ConfigService.cs index 5ada07a..691aef7 100644 --- a/WcsMain/ApiServe/Service/WcsService/ConfigService.cs +++ b/WcsMain/ApiServe/Service/WcsService/ConfigService.cs @@ -11,8 +11,6 @@ namespace WcsMain.ApiServe.Service.WcsService; [Service] public class ConfigService(AppConfigDao configDao) { - private readonly AppConfigDao _configDao = configDao; - /// /// 查询配置项，若查询参数为空则返回所有信息 /// @@ -20,7 +18,7 @@ public class ConfigService(AppConfigDao configDao) /// public WcsApiResponse> GetConfig(string? configKey) { - var configs = _configDao.GetAllConfig(configKey); + var configs = configDao.GetAllConfig(configKey); if(configs == default) { return WcsApiResponseFactory.DataBaseErr>(); @@ -35,7 +33,7 @@ public class ConfigService(AppConfigDao configDao) /// public WcsApiResponse> GetConfigWithPage(GetConfigWithPageRequest request) { - var (configs, totalNumber) = _configDao.GetAllConfigWithPage(request); + var (configs, totalNumber) = configDao.GetAllConfigWithPage(request); if (configs == default) { return WcsApiResponseFactory.DataBaseErr>(); @@ -66,12 +64,12 @@ public class ConfigService(AppConfigDao configDao) }; if (request.IsEdite) // 修改信息 { - var result = _configDao.Update(config); + var result = configDao.Update(config); return result > 0 ? WcsApiResponseFactory.Success() : WcsApiResponseFactory.DataBaseErr(); } else // 添加信息 { - var result = _configDao.Insert(config); + var result = configDao.Insert(config); return result > 0 ? WcsApiResponseFactory.Success() : WcsApiResponseFactory.DataBaseErr(); } diff --git a/WcsMain/ApiServe/Service/WcsService/ConveyService.cs b/WcsMain/ApiServe/Service/WcsService/ConveyService.cs index bac3cd8..75ac33f 100644 --- a/WcsMain/ApiServe/Service/WcsService/ConveyService.cs +++ b/WcsMain/ApiServe/Service/WcsService/ConveyService.cs @@ -10,8 +10,6 @@ namespace WcsMain.ApiServe.Service.WcsService; [Service] public class ConveyService(AppConveyTaskDao conveyTaskDao) { - private readonly AppConveyTaskDao _conveyTaskDao = conveyTaskDao; - /// /// 分页查询箱式线任务 /// @@ -19,7 +17,7 @@ public class ConveyService(AppConveyTaskDao conveyTaskDao) /// public WcsApiResponse> QueryConveyTaskWithPage(QueryConveyTaskWithPageRequest request) { - (List? conveyTasks, int totalRows) = _conveyTaskDao.QueryConveyTaskWithPage(request); + (List? conveyTasks, int totalRows) = conveyTaskDao.QueryConveyTaskWithPage(request); if (conveyTasks == default) { return WcsApiResponseFactory.DataBaseErr>(); diff --git a/WcsMain/ApiServe/Service/WcsService/ElTagService.cs b/WcsMain/ApiServe/Service/WcsService/ElTagService.cs index cac5c6f..d4d9356 100644 --- a/WcsMain/ApiServe/Service/WcsService/ElTagService.cs +++ b/WcsMain/ApiServe/Service/WcsService/ElTagService.cs @@ -13,10 +13,6 @@ namespace WcsMain.ApiServe.Service.WcsService; [Service] public class ElTagService(AppElTagTaskDao tagTaskDao, DataBaseData dataBaseData, AppElTagLocationDao tagLocationDao) { - private readonly DataBaseData _dataBaseData = dataBaseData; - private readonly AppElTagTaskDao _tagTaskDao = tagTaskDao; - private readonly AppElTagLocationDao _tagLocationDao = tagLocationDao; - /// /// 展示电子标签的数字 /// @@ -34,7 +30,7 @@ public class ElTagService(AppElTagTaskDao tagTaskDao, DataBaseData dataBaseData, /// public WcsApiResponse> QueryTaskWithPage(QueryTaskRequest request) { - (List? elTagTasks, int totalRows) = _tagTaskDao.QueryWithPage(request); + (List? elTagTasks, int totalRows) = tagTaskDao.QueryWithPage(request); if (elTagTasks == default) { return WcsApiResponseFactory.DataBaseErr>(); @@ -50,7 +46,7 @@ public class ElTagService(AppElTagTaskDao tagTaskDao, DataBaseData dataBaseData, /// public WcsApiResponse> QueryLocationWithPage(QueryLocationWithPageRequest request) { - (List? elTagLocations, int totalRows) = _tagLocationDao.QueryWithPage(request); + (List? elTagLocations, int totalRows) = tagLocationDao.QueryWithPage(request); if (elTagLocations == default) { return WcsApiResponseFactory.DataBaseErr>(); @@ -88,7 +84,7 @@ public class ElTagService(AppElTagTaskDao tagTaskDao, DataBaseData dataBaseData, elTagTask.Remark = "WCS变更信息 - 熄灭"; break; } - var updateResult = _tagTaskDao.Update(elTagTask); + var updateResult = tagTaskDao.Update(elTagTask); return updateResult > 0 ? WcsApiResponseFactory.Success() : WcsApiResponseFactory.DataBaseErr(); } @@ -100,9 +96,9 @@ public class ElTagService(AppElTagTaskDao tagTaskDao, DataBaseData dataBaseData, public WcsApiResponse AddTaskInfo(AddTaskInfoRequest request) { if (!CheckData.CheckDataRules(request)) return WcsApiResponseFactory.RequestErr(); - if(string.IsNullOrEmpty(request.TaskId)) request.TaskId = _dataBaseData.GetNewUUID(); - if(string.IsNullOrEmpty(request.TaskGroup)) request.TaskGroup = _dataBaseData.GetNewUUID2(); - var insertResult = _tagTaskDao.Insert(new AppElTagTask + if(string.IsNullOrEmpty(request.TaskId)) request.TaskId = dataBaseData.GetNewUUID(); + if(string.IsNullOrEmpty(request.TaskGroup)) request.TaskGroup = dataBaseData.GetNewUUID2(); + var insertResult = tagTaskDao.Insert(new AppElTagTask { TaskId = request.TaskId, TaskGroup = request.TaskGroup, diff --git a/WcsMain/ApiServe/Service/WcsService/LocationService.cs b/WcsMain/ApiServe/Service/WcsService/LocationService.cs index 81df705..f123f36 100644 --- a/WcsMain/ApiServe/Service/WcsService/LocationService.cs +++ b/WcsMain/ApiServe/Service/WcsService/LocationService.cs @@ -11,15 +11,13 @@ namespace WcsMain.ApiServe.Service.WcsService; public class LocationService(AppLocationDao locationDao) { - private readonly AppLocationDao _locationDao = locationDao; - /// /// 查询所有的点位状态 /// /// public WcsApiResponse> GetLocation() { - List? locations = _locationDao.Select(); + List? locations = locationDao.Select(); if (locations == default) { return WcsApiResponseFactory.DataBaseErr>(); @@ -34,7 +32,7 @@ public class LocationService(AppLocationDao locationDao) /// public WcsApiResponse> GetLocationWithPage(GetLocationWithPageRequest request) { - (List? locations, int totalRows) = _locationDao.SelectPage(request); + (List? locations, int totalRows) = locationDao.SelectPage(request); if(locations == default) { return WcsApiResponseFactory.DataBaseErr>(); @@ -66,7 +64,7 @@ public class LocationService(AppLocationDao locationDao) Explain = request.Explain, Remark = request.Remark }; - var result = _locationDao.Update(updateEntity); + var result = locationDao.Update(updateEntity); return result > 0 ? WcsApiResponseFactory.Success() : WcsApiResponseFactory.DataBaseErr(); } } diff --git a/WcsMain/ApiServe/Service/WcsService/MenuService.cs b/WcsMain/ApiServe/Service/WcsService/MenuService.cs index 0e716d6..15378d0 100644 --- a/WcsMain/ApiServe/Service/WcsService/MenuService.cs +++ b/WcsMain/ApiServe/Service/WcsService/MenuService.cs @@ -10,8 +10,6 @@ namespace WcsMain.ApiServe.Service.WcsService; [Service] public class MenuService(AppMenuDao menuDao) { - private readonly AppMenuDao _menuDao = menuDao; - /// /// 分页查询菜单信息 /// @@ -19,7 +17,7 @@ public class MenuService(AppMenuDao menuDao) /// public WcsApiResponse> GetMenuWithPage(GetMenuWithPageRequest request) { - var (menus, totalRows) = _menuDao.SelectPage(request); + var (menus, totalRows) = menuDao.SelectPage(request); if (menus == default) { return WcsApiResponseFactory.DataBaseErr>(); @@ -46,7 +44,7 @@ public class MenuService(AppMenuDao menuDao) MenuStatus = request.MenuStatus, Remark = request.Remark }; - var result = _menuDao.Update(menuData); + var result = menuDao.Update(menuData); return result > 0 ? WcsApiResponseFactory.Success() : WcsApiResponseFactory.DataBaseErr(); } @@ -70,7 +68,7 @@ public class MenuService(AppMenuDao menuDao) MenuStatus = request.MenuStatus, Remark = request.Remark }; - var result = _menuDao.Insert(menuData); + var result = menuDao.Insert(menuData); return result > 0 ? WcsApiResponseFactory.Success() : WcsApiResponseFactory.DataBaseErr(); } diff --git a/WcsMain/ApiServe/Service/WcsService/PlcDbService.cs b/WcsMain/ApiServe/Service/WcsService/PlcDbService.cs index b923db1..fe94422 100644 --- a/WcsMain/ApiServe/Service/WcsService/PlcDbService.cs +++ b/WcsMain/ApiServe/Service/WcsService/PlcDbService.cs @@ -11,7 +11,6 @@ namespace WcsMain.ApiServe.Service.WcsService; [Service] public class PlcDbService(AppDBDao dBDao) { - private readonly AppDBDao _dBDao = dBDao; /// /// 查询所有的Db地址信息 @@ -19,7 +18,7 @@ public class PlcDbService(AppDBDao dBDao) /// public WcsApiResponse> GetDB() { - List? dbs = _dBDao.Select(); + List? dbs = dBDao.Select(); if(dbs == default) { return WcsApiResponseFactory.DataBaseErr>(); @@ -49,7 +48,7 @@ public class PlcDbService(AppDBDao dBDao) IsSystem = request.IsSystem, Remark = request.Remark }; - List? dBs = _dBDao.Select(new AppDB { DBName = request.DbName}); + List? dBs = dBDao.Select(new AppDB { DBName = request.DbName}); if(dBs == default) { return WcsApiResponseFactory.DataBaseErr(); @@ -57,13 +56,13 @@ public class PlcDbService(AppDBDao dBDao) if (dBs.Count > 0) { // 修改信息 - var result = _dBDao.Update(db); + var result = dBDao.Update(db); return result > 0 ? WcsApiResponseFactory.Success() : WcsApiResponseFactory.DataBaseErr(); } else { // 添加信息 - var result = _dBDao.Insert(db); + var result = dBDao.Insert(db); return result > 0 ? WcsApiResponseFactory.Success() : WcsApiResponseFactory.DataBaseErr(); } @@ -80,7 +79,7 @@ public class PlcDbService(AppDBDao dBDao) { return WcsApiResponseFactory.RequestErr(); } - var result = _dBDao.Delete(new AppDB() { DBName = dbName }); + var result = dBDao.Delete(new AppDB() { DBName = dbName }); return result > 0 ? WcsApiResponseFactory.Success() : WcsApiResponseFactory.DataBaseErr(); } diff --git a/WcsMain/ApiServe/Service/WcsService/PlcService.cs b/WcsMain/ApiServe/Service/WcsService/PlcService.cs index fa6ff29..d3c595f 100644 --- a/WcsMain/ApiServe/Service/WcsService/PlcService.cs +++ b/WcsMain/ApiServe/Service/WcsService/PlcService.cs @@ -12,13 +12,9 @@ namespace WcsMain.ApiServe.Service.WcsService; [Service] public class PlcService(AppPLCDao pLCDao) { - - private readonly AppPLCDao _plcDao = pLCDao; - - public WcsApiResponse> GetPlc() { - List? plcs = _plcDao.Query(); + List? plcs = pLCDao.Query(); if (plcs == default) { return WcsApiResponseFactory.DataBaseErr>(); @@ -51,7 +47,7 @@ public class PlcService(AppPLCDao pLCDao) Remark = request.Remark }; /* 判断这个编号是否存在 */ - List ? appPLCs = _plcDao.Query(new AppPLC { PLCId = request.PlcId}); + List ? appPLCs = pLCDao.Query(new AppPLC { PLCId = request.PlcId}); if (appPLCs == default) { return WcsApiResponseFactory.DataBaseErr(); @@ -59,13 +55,13 @@ public class PlcService(AppPLCDao pLCDao) if (appPLCs.Count > 0) { // 修改信息 - var result = _plcDao.Update(plc); + var result = pLCDao.Update(plc); return result > 0 ? WcsApiResponseFactory.Success() : WcsApiResponseFactory.DataBaseErr(); } else { // 添加信息 - var result = _plcDao.Insert(plc); + var result = pLCDao.Insert(plc); return result > 0 ? WcsApiResponseFactory.Success() : WcsApiResponseFactory.DataBaseErr(); } } @@ -78,7 +74,7 @@ public class PlcService(AppPLCDao pLCDao) public WcsApiResponse DeletePlc(int? plcId) { if(plcId == default) return WcsApiResponseFactory.RequestErr(); - var result = _plcDao.Delete(new AppPLC { PLCId = plcId }); + var result = pLCDao.Delete(new AppPLC { PLCId = plcId }); return result > 0 ? WcsApiResponseFactory.Success() : WcsApiResponseFactory.DataBaseErr(); } } \ No newline at end of file diff --git a/WcsMain/ApiServe/Service/WcsService/SettingService.cs b/WcsMain/ApiServe/Service/WcsService/SettingService.cs index de5db29..121e73f 100644 --- a/WcsMain/ApiServe/Service/WcsService/SettingService.cs +++ b/WcsMain/ApiServe/Service/WcsService/SettingService.cs @@ -11,9 +11,6 @@ namespace WcsMain.ApiServe.Service.WcsService; [Service] public class SettingService(AppSettingsDao settingsDao) { - - private readonly AppSettingsDao _settingsDao = settingsDao; - /// /// 根据键名查询设置项 /// @@ -21,7 +18,7 @@ public class SettingService(AppSettingsDao settingsDao) /// public WcsApiResponse> GetConfig(string? settingKey) { - List? configs = _settingsDao.Select(new AppSettings() { SettingKey = settingKey }); + List? configs = settingsDao.Select(new AppSettings() { SettingKey = settingKey }); if(configs == default) { return WcsApiResponseFactory.DataBaseErr>(); @@ -41,7 +38,7 @@ public class SettingService(AppSettingsDao settingsDao) { return WcsApiResponseFactory.RequestErr(); } - int updateRows = _settingsDao.Update(new AppSettings() + int updateRows = settingsDao.Update(new AppSettings() { SettingKey = request.SettingKey, SettingName = request.SettingName, diff --git a/WcsMain/ApiServe/Service/WcsService/SocketService.cs b/WcsMain/ApiServe/Service/WcsService/SocketService.cs index 45ff99c..e465d25 100644 --- a/WcsMain/ApiServe/Service/WcsService/SocketService.cs +++ b/WcsMain/ApiServe/Service/WcsService/SocketService.cs @@ -12,16 +12,13 @@ namespace WcsMain.ApiServe.Service.WcsService; [Service] public class SocketService(AppTcpDao socketDao) { - - private readonly AppTcpDao _socketDao = socketDao; - /// /// 查询 socket 连接信息 /// /// public WcsApiResponse> GetDB() { - List? sockets = _socketDao.Query(); + List? sockets = socketDao.Query(); if (sockets == default) { return WcsApiResponseFactory.DataBaseErr>(); @@ -58,14 +55,14 @@ public class SocketService(AppTcpDao socketDao) TcpStatus = socketStatus, Remark = request.Remark, }; - int updateRows = _socketDao.Update(socket); + int updateRows = socketDao.Update(socket); return updateRows > 0 ? WcsApiResponseFactory.Success() : WcsApiResponseFactory.DataBaseErr(); } else { // 新增一条记录 /* 校验这个编号是否已经存在 */ - List? checks = _socketDao.Query(new AppTcp() { TcpId = socketNo }); + List? checks = socketDao.Query(new AppTcp() { TcpId = socketNo }); if (checks == default) { return WcsApiResponseFactory.DataBaseErr(); @@ -83,7 +80,7 @@ public class SocketService(AppTcpDao socketDao) TcpStatus = socketStatus, Remark = request.Remark, }; - int insertRows = _socketDao.Insert(socket); + int insertRows = socketDao.Insert(socket); return insertRows > 0 ? WcsApiResponseFactory.Success() : WcsApiResponseFactory.DataBaseErr(); } } @@ -101,7 +98,7 @@ public class SocketService(AppTcpDao socketDao) return WcsApiResponseFactory.RequestErr(); } int socketNo = Convert.ToInt32(socketNoStr); - int deleteRows = _socketDao.Delete(new AppTcp() { TcpId = socketNo }); + int deleteRows = socketDao.Delete(new AppTcp() { TcpId = socketNo }); return deleteRows > 0 ? WcsApiResponseFactory.Success() : WcsApiResponseFactory.DataBaseErr(); } } \ No newline at end of file diff --git a/WcsMain/ApiServe/Service/WcsService/StackerService.cs b/WcsMain/ApiServe/Service/WcsService/StackerService.cs index bce8688..b467e0e 100644 --- a/WcsMain/ApiServe/Service/WcsService/StackerService.cs +++ b/WcsMain/ApiServe/Service/WcsService/StackerService.cs @@ -13,17 +13,13 @@ namespace WcsMain.ApiServe.Service.WcsService; [Service] public class StackerService(AppStackerDao stackerDao, StackerOperation stackerOperation) { - - private readonly AppStackerDao _stackerDao = stackerDao; - private readonly StackerOperation _stackerOperation = stackerOperation; - /// /// 查询所有的 堆垛机信息 /// /// public WcsApiResponse> GetStacker() { - List? stackers = _stackerDao.Select(new AppStacker()); + List? stackers = stackerDao.Select(new AppStacker()); if(stackers == default) { return WcsApiResponseFactory.DataBaseErr>(); @@ -37,7 +33,7 @@ public class StackerService(AppStackerDao stackerDao, StackerOperation stackerOp /// public WcsApiResponse> GetStackerStatus() { - List? stackers = _stackerDao.Select(new AppStacker()); + List? stackers = stackerDao.Select(new AppStacker()); if (stackers == default) { return WcsApiResponseFactory.DataBaseErr>(); @@ -53,7 +49,7 @@ public class StackerService(AppStackerDao stackerDao, StackerOperation stackerOp ForkStatus = stacker.ForkStatus, }; /* 获取堆垛机状态 */ - var (errMsg, stackerInfo) = _stackerOperation.GetStackerInfo((int)stacker.StackerId!); + var (errMsg, stackerInfo) = stackerOperation.GetStackerInfo((int)stacker.StackerId!); if(string.IsNullOrEmpty(errMsg) && stackerInfo != default) { stackerStatusResponse.Message = "查询成功"; @@ -88,14 +84,14 @@ public class StackerService(AppStackerDao stackerDao, StackerOperation stackerOp return WcsApiResponseFactory.RequestErr(); } /* 查询是否存在这个编号的堆垛机，若存在则更新数据，若不存在则添加 */ - List? appStackers = _stackerDao.Select(new AppStacker { StackerId = request.StackerId }); + List? appStackers = stackerDao.Select(new AppStacker { StackerId = request.StackerId }); if (appStackers == default) { return WcsApiResponseFactory.DataBaseErr(); } if (appStackers.Count == 0) // 没有数据，新增一条新的 { - var insertResult = _stackerDao.Insert(new AppStacker + var insertResult = stackerDao.Insert(new AppStacker { StackerId = request.StackerId, StackerName = request.StackerName, @@ -110,7 +106,7 @@ public class StackerService(AppStackerDao stackerDao, StackerOperation stackerOp } else // 存在，更新数据 { - var updateResult = _stackerDao.Update(new AppStacker + var updateResult = stackerDao.Update(new AppStacker { StackerId = request.StackerId, StackerName = request.StackerName, diff --git a/WcsMain/ApiServe/Service/WcsService/UserGroupService.cs b/WcsMain/ApiServe/Service/WcsService/UserGroupService.cs index 025ba47..9470af5 100644 --- a/WcsMain/ApiServe/Service/WcsService/UserGroupService.cs +++ b/WcsMain/ApiServe/Service/WcsService/UserGroupService.cs @@ -11,15 +11,13 @@ namespace WcsMain.ApiServe.Service.WcsService; [Service] public class UserGroupService(AppUserGroupDao userGroupDao) { - private readonly AppUserGroupDao _userGroupDao = userGroupDao; - /// /// 查询用户组 /// /// public WcsApiResponse> GetUserGroup() { - var userGroup = _userGroupDao.Query(); + var userGroup = userGroupDao.Query(); if(userGroup == default) { return WcsApiResponseFactory.DataBaseErr>(); @@ -42,7 +40,7 @@ public class UserGroupService(AppUserGroupDao userGroupDao) return WcsApiResponseFactory.RequestErr(); } // 检查该用户组是否存在 - List? checkUserGroup = _userGroupDao.Query(new AppUserGroup { GroupId = request.GroupId }); + List? checkUserGroup = userGroupDao.Query(new AppUserGroup { GroupId = request.GroupId }); if (checkUserGroup == default) { return WcsApiResponseFactory.DataBaseErr(); @@ -58,7 +56,7 @@ public class UserGroupService(AppUserGroupDao userGroupDao) GroupName = request.GroupName, GroupStatus = request.GroupStatus }; - var result = _userGroupDao.Insert(userGroup); + var result = userGroupDao.Insert(userGroup); return result > 0 ? WcsApiResponseFactory.Success() : WcsApiResponseFactory.DataBaseErr(); } @@ -76,7 +74,7 @@ public class UserGroupService(AppUserGroupDao userGroupDao) return WcsApiResponseFactory.RequestErr(); } // 检查该用户组是否存在 - List? checkUserGroup = _userGroupDao.Query(new AppUserGroup { GroupId = groupId }); + List? checkUserGroup = userGroupDao.Query(new AppUserGroup { GroupId = groupId }); if (checkUserGroup == default) { return WcsApiResponseFactory.DataBaseErr(); @@ -86,7 +84,7 @@ public class UserGroupService(AppUserGroupDao userGroupDao) return WcsApiResponseFactory.DataRepetition("该用户组不存在"); } // 删除用户组 - var result = _userGroupDao.Delete(new AppUserGroup { GroupId = groupId }); + var result = userGroupDao.Delete(new AppUserGroup { GroupId = groupId }); return result > 0 ? WcsApiResponseFactory.Success() : WcsApiResponseFactory.DataBaseErr(); diff --git a/WcsMain/ApiServe/Service/WcsService/UserRuleService.cs b/WcsMain/ApiServe/Service/WcsService/UserRuleService.cs index 3d52dc4..d951537 100644 --- a/WcsMain/ApiServe/Service/WcsService/UserRuleService.cs +++ b/WcsMain/ApiServe/Service/WcsService/UserRuleService.cs @@ -11,15 +11,13 @@ namespace WcsMain.ApiServe.Service.WcsService; [Service] public class UserRuleService(AppUserRuleDao userRuleDao) { - private readonly AppUserRuleDao _userRuleDao = userRuleDao; - /// /// 获取用户组权限 /// /// public WcsApiResponse> GetUserRule(string? groupId) { - var userRule = _userRuleDao.Query(new AppUserRule() { GroupId = groupId }); + var userRule = userRuleDao.Query(new AppUserRule() { GroupId = groupId }); if(userRule == default) { return WcsApiResponseFactory.DataBaseErr>(); @@ -39,7 +37,7 @@ public class UserRuleService(AppUserRuleDao userRuleDao) { return WcsApiResponseFactory.RequestErr(); } - bool result = _userRuleDao.UpdateUserRule(request); + bool result = userRuleDao.UpdateUserRule(request); return result ? WcsApiResponseFactory.Success() : WcsApiResponseFactory.Fail(); } diff --git a/WcsMain/ApiServe/Service/WcsService/UserService.cs b/WcsMain/ApiServe/Service/WcsService/UserService.cs index 80f9043..1d73446 100644 --- a/WcsMain/ApiServe/Service/WcsService/UserService.cs +++ b/WcsMain/ApiServe/Service/WcsService/UserService.cs @@ -12,9 +12,6 @@ namespace WcsMain.ApiServe.Service.WcsService; [Service] public class UserService(AppUserDao appUserDao, AppMenuDao menuDao) { - private readonly AppUserDao _userDao = appUserDao; - private readonly AppMenuDao _menuDao = menuDao; - /// /// 登录请求的具体实现 /// @@ -30,7 +27,7 @@ public class UserService(AppUserDao appUserDao, AppMenuDao menuDao) } string encryptPwd = Md5Encrypt.EncryptPassword(request.UserPassword); /* 判断用户账户ID和密码是否正确 */ - List? loginUser = _userDao.Query(new AppUser { UserId = request.UserId, UserPassword = encryptPwd }); + List? loginUser = appUserDao.Query(new AppUser { UserId = request.UserId, UserPassword = encryptPwd }); if (loginUser == default) { return WcsApiResponseFactory.DataBaseErr(); @@ -51,7 +48,7 @@ public class UserService(AppUserDao appUserDao, AppMenuDao menuDao) /// private LoginResponse? GetUserMenu(AppUser user) { - var menus = _menuDao.GetMenuWithGroupId(user.UserGroup!); + var menus = menuDao.GetMenuWithGroupId(user.UserGroup!); if (menus == default || menus.Count < 1) { return default; @@ -99,7 +96,7 @@ public class UserService(AppUserDao appUserDao, AppMenuDao menuDao) /// public WcsApiResponse> GetUserWithPage(GetUserWithPageRequest request) { - var (users, total) = _userDao.QueryWithPage(request); + var (users, total) = appUserDao.QueryWithPage(request); return WcsApiResponseFactory.Success(users, total.ToString()); } diff --git a/WcsMain/ApiServe/Service/WcsService/WcsTaskService.cs b/WcsMain/ApiServe/Service/WcsService/WcsTaskService.cs index 7ba2505..64a0a1e 100644 --- a/WcsMain/ApiServe/Service/WcsService/WcsTaskService.cs +++ b/WcsMain/ApiServe/Service/WcsService/WcsTaskService.cs @@ -13,15 +13,13 @@ namespace WcsMain.ApiServe.Service.WcsService; [Service] public class WcsTaskService(AppWcsTaskDao wcsTaskDao) { - private readonly AppWcsTaskDao _wcsTaskDao = wcsTaskDao; - /// /// 查询所有的Wcs任务列表 /// /// public WcsApiResponse> GetWcsTask() { - List? wcsTasks = _wcsTaskDao.Select(); + List? wcsTasks = wcsTaskDao.Select(); if(wcsTasks == default) { return WcsApiResponseFactory.DataBaseErr>(); @@ -37,7 +35,7 @@ public class WcsTaskService(AppWcsTaskDao wcsTaskDao) /// public WcsApiResponse> GetWcsTaskWithTaskId(string taskId) { - List? wcsTasks = _wcsTaskDao.GetAllTasksWithBakData(taskId); + List? wcsTasks = wcsTaskDao.GetAllTasksWithBakData(taskId); if (wcsTasks == default) { return WcsApiResponseFactory.DataBaseErr>(); @@ -52,7 +50,7 @@ public class WcsTaskService(AppWcsTaskDao wcsTaskDao) /// public WcsApiResponse> GetWcsTaskWithPage([FromBody] GetWcsTaskWithPageRequest request) { - (List? wcsTasks, int totalRows) = _wcsTaskDao.SelectPage(request); + (List? wcsTasks, int totalRows) = wcsTaskDao.SelectPage(request); if (wcsTasks == default) { return WcsApiResponseFactory.DataBaseErr>(); @@ -72,7 +70,7 @@ public class WcsTaskService(AppWcsTaskDao wcsTaskDao) { return WcsApiResponseFactory.RequestErr(); } - var taskData = _wcsTaskDao.Select(new AppWcsTask() { PlcId = request.PlcId }); + var taskData = wcsTaskDao.Select(new AppWcsTask() { PlcId = request.PlcId }); if (taskData == default) { return WcsApiResponseFactory.DataBaseErr(); @@ -81,7 +79,7 @@ public class WcsTaskService(AppWcsTaskDao wcsTaskDao) { return WcsApiResponseFactory.Fail("找不到该任务，可能该任务不存在或者已经完结"); } - int updateRows = _wcsTaskDao.Update(new AppWcsTask() + int updateRows = wcsTaskDao.Update(new AppWcsTask() { PlcId = request.PlcId, TaskStatus = request.TaskStatus, diff --git a/WcsMain/ApiServe/Service/WcsService/WmsTaskService.cs b/WcsMain/ApiServe/Service/WcsService/WmsTaskService.cs index 550e211..9b3d4c0 100644 --- a/WcsMain/ApiServe/Service/WcsService/WmsTaskService.cs +++ b/WcsMain/ApiServe/Service/WcsService/WmsTaskService.cs @@ -16,18 +16,13 @@ namespace WcsMain.ApiServe.Service.WcsService; [Service] public class WmsTaskService(WmsTaskAction wmsTaskAction, AppWmsTaskDao wmsTaskDao, DataBaseData dataBaseData) { - private readonly DataBaseData _dataBaseData = dataBaseData; - private readonly WmsTaskAction _wmsTaskAction = wmsTaskAction; - private readonly AppWmsTaskDao _wmsTaskDao = wmsTaskDao; - - /// /// 查询Wms 任务表 /// /// public WcsApiResponse> GetWmsTask() { - List? wmsTasks = _wmsTaskDao.SelectToWeb(); + List? wmsTasks = wmsTaskDao.SelectToWeb(); if(wmsTasks == default) { return WcsApiResponseFactory.DataBaseErr>(); @@ -43,7 +38,7 @@ public class WmsTaskService(WmsTaskAction wmsTaskAction, AppWmsTaskDao wmsTaskDa /// public WcsApiResponse> GetWmsTaskWithPage(GetWmsTaskWithPageRequest request) { - (List? wmsTasks, int totalRows) = _wmsTaskDao.SelectPage(request); + (List? wmsTasks, int totalRows) = wmsTaskDao.SelectPage(request); if(wmsTasks == default) { return WcsApiResponseFactory.DataBaseErr>(); @@ -58,7 +53,7 @@ public class WmsTaskService(WmsTaskAction wmsTaskAction, AppWmsTaskDao wmsTaskDa /// public WcsApiResponse GetStackerTask(SetWmsTask request) { - request.TaskId = _dataBaseData.GetNewUUID(); + request.TaskId = dataBaseData.GetNewUUID(); bool checkData = CheckData.CheckDataRules(request); if (!checkData) { @@ -82,8 +77,8 @@ public class WmsTaskService(WmsTaskAction wmsTaskAction, AppWmsTaskDao wmsTaskDa CreatePerson = StaticString.WCS, }; /* 插入任务数据 */ - //int insertRows = _wmsTaskDao.Insert(wmsTasks.ToArray()); // ---- 直接插入任务数据 - int insertRows = _wmsTaskDao.InsertTaskAndMarkErr(wmsTask); // ---- 先清除这个料箱之前未作的任务，然后插入新数据 + //int insertRows = wmsTaskDao.Insert(wmsTasks.ToArray()); // ---- 直接插入任务数据 + int insertRows = wmsTaskDao.InsertTaskAndMarkErr(wmsTask); // ---- 先清除这个料箱之前未作的任务，然后插入新数据 if (insertRows > 0) { return WcsApiResponseFactory.Success($"任务创建成功，任务号：{request.TaskId}"); @@ -104,7 +99,7 @@ public class WmsTaskService(WmsTaskAction wmsTaskAction, AppWmsTaskDao wmsTaskDa return WcsApiResponseFactory.RequestErr(); } /* 校验任务是否存在 */ - var tasks = _wmsTaskDao.Select(new AppWmsTask { TaskId = request.TaskId }); + var tasks = wmsTaskDao.Select(new AppWmsTask { TaskId = request.TaskId }); if (tasks == default) { // 查询失败 @@ -119,13 +114,13 @@ public class WmsTaskService(WmsTaskAction wmsTaskAction, AppWmsTaskDao wmsTaskDa switch (status) { case 0: - string resetErrText = _wmsTaskAction.ResetWmsTaskStatus(request.TaskId, request.Destination, StaticString.WCS); // 重置任务 + string resetErrText = wmsTaskAction.ResetWmsTaskStatus(request.TaskId, request.Destination, StaticString.WCS); // 重置任务 return string.IsNullOrEmpty(resetErrText) ? WcsApiResponseFactory.Success() : WcsApiResponseFactory.Fail(resetErrText); case 3: - string completeErrText = _wmsTaskAction.CompleteWmsTaskStatus(request.TaskId, StaticString.WCS); // 完成任务 + string completeErrText = wmsTaskAction.CompleteWmsTaskStatus(request.TaskId, StaticString.WCS); // 完成任务 return string.IsNullOrEmpty(completeErrText) ? WcsApiResponseFactory.Success() : WcsApiResponseFactory.Fail(completeErrText); case 999: - string deleteErrText = _wmsTaskAction.DeleteWmsTaskStatus(request.TaskId, StaticString.WCS); // 删除任务 + string deleteErrText = wmsTaskAction.DeleteWmsTaskStatus(request.TaskId, StaticString.WCS); // 删除任务 return string.IsNullOrEmpty(deleteErrText) ? WcsApiResponseFactory.Success() : WcsApiResponseFactory.Fail(deleteErrText); default: return WcsApiResponseFactory.Fail($"任务状态不支持：任务状态：{request.TaskStatus}"); diff --git a/WcsMain/ApiServe/Service/WmsService/ConveyService.cs b/WcsMain/ApiServe/Service/WmsService/ConveyService.cs index 4386581..01c1eb8 100644 --- a/WcsMain/ApiServe/Service/WmsService/ConveyService.cs +++ b/WcsMain/ApiServe/Service/WmsService/ConveyService.cs @@ -15,10 +15,6 @@ namespace WcsMain.ApiServe.Service.WmsService; [Service] public class ConveyService(DataBaseData dataBaseData, AppConveyTaskDao conveyTaskDao, ConveyOperation conveyOperation) { - private readonly DataBaseData _databseData = dataBaseData; - private readonly AppConveyTaskDao _conveyTaskDao = conveyTaskDao; - private readonly ConveyOperation _conveyOperation = conveyOperation; - /// /// 接收WMS发送过来的输送线任务 /// @@ -32,7 +28,7 @@ public class ConveyService(DataBaseData dataBaseData, AppConveyTaskDao conveyTas } if (request.TaskGroup == default) { - request.TaskGroup = _databseData.GetNewUUID2(); // 当任务组为空时生成一个新的 + request.TaskGroup = dataBaseData.GetNewUUID2(); // 当任务组为空时生成一个新的 } List conveyTasks = []; DateTime now = DateTime.Now; @@ -40,7 +36,7 @@ public class ConveyService(DataBaseData dataBaseData, AppConveyTaskDao conveyTas { conveyTasks.Add(new AppConveyTask { - TaskId = _databseData.GetNewUUID(), + TaskId = dataBaseData.GetNewUUID(), TaskGroup = request.TaskGroup, VehicleNo = request.VehicleNo, TaskType = request.TaskType, @@ -50,7 +46,7 @@ public class ConveyService(DataBaseData dataBaseData, AppConveyTaskDao conveyTas CreateTime = now, }); } - var insertResult = _conveyTaskDao.Insert(conveyTasks); + var insertResult = conveyTaskDao.Insert(conveyTasks); return insertResult > 0 ? WmsApiResponseFactory.Success() : WmsApiResponseFactory.DataBaseErr(); } @@ -62,7 +58,7 @@ public class ConveyService(DataBaseData dataBaseData, AppConveyTaskDao conveyTas public WmsApiResponse DisposeVehicle(DisposeVehicleRequest request) { if(string.IsNullOrEmpty(request.Location)) return WmsApiResponseFactory.RequestErr("存在必填项未填"); - var writeResult = _conveyOperation.DisposeVehicle(request.Location); + var writeResult = conveyOperation.DisposeVehicle(request.Location); if(string.IsNullOrEmpty(writeResult)) return WmsApiResponseFactory.Success(); return WmsApiResponseFactory.Fail(writeResult); } diff --git a/WcsMain/ApiServe/Service/WmsService/ElTagService.cs b/WcsMain/ApiServe/Service/WmsService/ElTagService.cs index 91cebd5..75ace3d 100644 --- a/WcsMain/ApiServe/Service/WmsService/ElTagService.cs +++ b/WcsMain/ApiServe/Service/WmsService/ElTagService.cs @@ -14,9 +14,6 @@ namespace WcsMain.ApiServe.Service.WmsService; [Service] public class ElTagService(DataBaseData dataBaseData, AppElTagTaskDao elTagTaskDao) { - private readonly DataBaseData _dataBaseData = dataBaseData; - private readonly AppElTagTaskDao _elTagTaskDao = elTagTaskDao; - /// /// 接收电子标签任务 /// @@ -37,7 +34,7 @@ public class ElTagService(DataBaseData dataBaseData, AppElTagTaskDao elTagTaskDa } if(request.TaskGroup == default) { - request.TaskGroup = _dataBaseData.GetNewUUID2(); + request.TaskGroup = dataBaseData.GetNewUUID2(); } /* 插入任务 */ List elTagTasks = []; @@ -46,7 +43,7 @@ public class ElTagService(DataBaseData dataBaseData, AppElTagTaskDao elTagTaskDa { elTagTasks.Add(new AppElTagTask() { - TaskId = string.IsNullOrEmpty(elTagTask.TaskId) ? _dataBaseData.GetNewUUID() : elTagTask.TaskId, + TaskId = string.IsNullOrEmpty(elTagTask.TaskId) ? dataBaseData.GetNewUUID() : elTagTask.TaskId, TaskGroup = request.TaskGroup, TaskType = request.TaskType, Location = elTagTask.Location, @@ -60,7 +57,7 @@ public class ElTagService(DataBaseData dataBaseData, AppElTagTaskDao elTagTaskDa CreateTime = now }); } - var insertResult = _elTagTaskDao.Insert(elTagTasks.ToArray()); + var insertResult = elTagTaskDao.Insert(elTagTasks.ToArray()); return insertResult > 0 ? WmsApiResponseFactory.Success() : WmsApiResponseFactory.DataBaseErr(); } } diff --git a/WcsMain/ApiServe/Service/WmsService/WmsTaskService.cs b/WcsMain/ApiServe/Service/WmsService/WmsTaskService.cs index ce0bcbb..f3d6880 100644 --- a/WcsMain/ApiServe/Service/WmsService/WmsTaskService.cs +++ b/WcsMain/ApiServe/Service/WmsService/WmsTaskService.cs @@ -19,12 +19,8 @@ namespace WcsMain.ApiServe.Service.WmsService; /// Wms任务接口逻辑 /// [Service] -public class WmsTaskService(WmsTaskAction wmsTaskAction, AppWmsTaskDao wmsTaskDao, AppWcsTaskDao wcsTaskDao) +public class WmsTaskService(WmsTaskAction wmsTaskAction, AppWmsTaskDao wmsTaskDao) { - private readonly AppWmsTaskDao _wmsTaskDao = wmsTaskDao; - private readonly WmsTaskAction _wmsTaskAction = wmsTaskAction; - private readonly AppWcsTaskDao _wcsTaskDao = wcsTaskDao; - /// /// 接收WMS任务数据处理 /// @@ -101,7 +97,7 @@ public class WmsTaskService(WmsTaskAction wmsTaskAction, AppWmsTaskDao wmsTaskDa foreach (var checkEntity in wmsTasks) { /* 检查任务号是否重复 */ - List? checkSame = _wmsTaskDao.Select(new AppWmsTask() { TaskId = checkEntity.TaskId }); + List? checkSame = wmsTaskDao.Select(new AppWmsTask() { TaskId = checkEntity.TaskId }); if (checkSame == default) return WmsApiResponseFactory.DataBaseErr(errRequest); if (checkSame.Count > 0 || taskIds.Exists(e => e == checkEntity.TaskId)) { @@ -110,8 +106,8 @@ public class WmsTaskService(WmsTaskAction wmsTaskAction, AppWmsTaskDao wmsTaskDa taskIds.Add(checkEntity.TaskId); } /* 插入任务数据 */ - //int insertRows = _wmsTaskDao.Insert(wmsTasks.ToArray()); // ---- 直接插入任务数据 - int insertRows = _wmsTaskDao.InsertTaskAndMarkErr([.. wmsTasks]); // ---- 先清除这个料箱之前未作的任务，然后插入新数据 + //int insertRows = wmsTaskDao.Insert(wmsTasks.ToArray()); // ---- 直接插入任务数据 + int insertRows = wmsTaskDao.InsertTaskAndMarkErr([.. wmsTasks]); // ---- 先清除这个料箱之前未作的任务，然后插入新数据 if (insertRows > 0) return WmsApiResponseFactory.Success(errRequest, $"任务创建成功，任务号：{string.Join(',', taskIds)}"); return WmsApiResponseFactory.Fail(errRequest, "数据插入失败，请稍后重试或者联系我们"); } @@ -135,20 +131,20 @@ public class WmsTaskService(WmsTaskAction wmsTaskAction, AppWmsTaskDao wmsTaskDa bool checkData = CheckData.CheckDataRules(request); if (!checkData) return WmsApiResponseFactory.RequestErr(); /* 校验任务是否存在 */ - var tasks = _wmsTaskDao.Select(new AppWmsTask { TaskId = request.TaskId }); + var tasks = wmsTaskDao.Select(new AppWmsTask { TaskId = request.TaskId }); if (tasks == default) return WmsApiResponseFactory.DataBaseErr(); // 数据库连接失败 if (tasks.Count == 0) return WmsApiResponseFactory.RequestErr($"任务：{request.TaskId} 不存在"); int? status = request.TaskStatus; switch(status) { case 0: - string resetErrText = _wmsTaskAction.ResetWmsTaskStatus(request.TaskId, request.Destination, StaticString.WMS); // 重置任务 + string resetErrText = wmsTaskAction.ResetWmsTaskStatus(request.TaskId, request.Destination, StaticString.WMS); // 重置任务 return string.IsNullOrEmpty(resetErrText) ? WmsApiResponseFactory.Success() : WmsApiResponseFactory.Fail(resetErrText); case 2: - string completeErrText = _wmsTaskAction.CompleteWmsTaskStatus(request.TaskId, StaticString.WMS); // 完成任务 + string completeErrText = wmsTaskAction.CompleteWmsTaskStatus(request.TaskId, StaticString.WMS); // 完成任务 return string.IsNullOrEmpty(completeErrText) ? WmsApiResponseFactory.Success() : WmsApiResponseFactory.Fail(completeErrText); case 1: - string deleteErrText = _wmsTaskAction.DeleteWmsTaskStatus(request.TaskId, StaticString.WMS); // 删除任务 + string deleteErrText = wmsTaskAction.DeleteWmsTaskStatus(request.TaskId, StaticString.WMS); // 删除任务 return string.IsNullOrEmpty(deleteErrText) ? WmsApiResponseFactory.Success() : WmsApiResponseFactory.Fail(deleteErrText); default: return WmsApiResponseFactory.RequestErr($"不支持的任务状态：{request.TaskStatus}"); diff --git a/WcsMain/StartAction/HostService.cs b/WcsMain/StartAction/HostService.cs index e4b5e09..bf2c7fd 100644 --- a/WcsMain/StartAction/HostService.cs +++ b/WcsMain/StartAction/HostService.cs @@ -7,8 +7,6 @@ namespace WcsMain.StartAction; /// public class HostService(ServiceStart serverStart) : IHostedLifecycleService { - private readonly ServiceStart _serverStart = serverStart; - public Task StartAsync(CancellationToken cancellationToken) { return Task.CompletedTask; @@ -23,7 +21,7 @@ public class HostService(ServiceStart serverStart) : IHostedLifecycleService { return Task.Run(() => { - _serverStart.LoadingData(); // 加载必要参数 + serverStart.LoadingData(); // 加载必要参数 string? loadingResult = LoadingRunningData.GetResult(); if (!string.IsNullOrEmpty(loadingResult)) { @@ -43,7 +41,7 @@ public class HostService(ServiceStart serverStart) : IHostedLifecycleService } else { - _serverStart.Start(); + serverStart.Start(); } ConsoleLog.Success("WCS服务启动完成"); }, cancellationToken); diff --git a/WcsMain/StartAction/ServiceStart.cs b/WcsMain/StartAction/ServiceStart.cs index 51a68f2..520c16a 100644 --- a/WcsMain/StartAction/ServiceStart.cs +++ b/WcsMain/StartAction/ServiceStart.cs @@ -21,17 +21,6 @@ public class ServiceStart(WcsCirculation wcsCirculation, ConnectPLCs connectPLCs AppStackerDao appStackerDao, AppLocationDao appLocationDao, AppConfigDao appConfigDao, ConnectPlcServe connectPlcServe, ConnectOprServe connectOprServe, AppElTagLocationDao appElTagBaseDao, AppConveyStandDao conveyStandDao) { - private readonly AppConfigDao _appconfigDao = appConfigDao; - private readonly AppLocationDao _applocationDao = appLocationDao; - private readonly AppStackerDao _appStackerDao = appStackerDao; - private readonly SocketOperation _socketOperation = socketOperation; - private readonly ConnectPLCs _connectPlcs = connectPLCs; - private readonly WcsCirculation _wcsCirculation = wcsCirculation; - private readonly ConnectPlcServe _connectPlcServe = connectPlcServe; - private readonly ConnectOprServe _connectOprServe = connectOprServe; - private readonly AppElTagLocationDao _appElTagBaseDao = appElTagBaseDao; - private readonly AppConveyStandDao _conveyStandDao = conveyStandDao; - private static string _errMsg = string.Empty; /// @@ -73,7 +62,7 @@ public class ServiceStart(WcsCirculation wcsCirculation, ConnectPLCs connectPLCs { if (CommonData.AppConfig.UseConnectPlc == "1") // 1 表示允许连接PLC { - _connectPlcs.ConnectPlc(); + connectPLCs.ConnectPlc(); } } @@ -84,7 +73,7 @@ public class ServiceStart(WcsCirculation wcsCirculation, ConnectPLCs connectPLCs { if (CommonData.AppConfig.UseSocket == "1") // 1 表示允许开启Socket { - _socketOperation.Connect(); + socketOperation.Connect(); } } @@ -95,8 +84,8 @@ public class ServiceStart(WcsCirculation wcsCirculation, ConnectPLCs connectPLCs { if (CommonData.AppConfig.UseOpr == "1") // 1 表示允许连接电子标签 { - _connectOprServe.SetBaseAction(); - _connectOprServe.Connect(); + connectOprServe.SetBaseAction(); + connectOprServe.Connect(); } } @@ -104,8 +93,8 @@ public class ServiceStart(WcsCirculation wcsCirculation, ConnectPLCs connectPLCs public void CreateTcpClient() { - _connectPlcServe.SetBaseAction(); - _connectPlcServe.ConnectPlc(); + connectPlcServe.SetBaseAction(); + connectPlcServe.ConnectPlc(); } @@ -116,15 +105,15 @@ public class ServiceStart(WcsCirculation wcsCirculation, ConnectPLCs connectPLCs { if (CommonData.AppConfig.UseCirculation == "1") // 1 表示允许开启 定时器 { - _wcsCirculation.ExceptionHandler += (methodDescription, ex) => + wcsCirculation.ExceptionHandler += (methodDescription, ex) => { ConsoleLog.Error($"定时器：{methodDescription} 发生异常，异常信息：{ex}"); }; - _wcsCirculation.MessageHandler += (msg) => + wcsCirculation.MessageHandler += (msg) => { //ConsoleLog.Tip(msg); }; - _wcsCirculation.StartAssemblyCirculation(GetType().Assembly); + wcsCirculation.StartAssemblyCirculation(GetType().Assembly); } } @@ -136,7 +125,7 @@ public class ServiceStart(WcsCirculation wcsCirculation, ConnectPLCs connectPLCs { if (!string.IsNullOrEmpty(_errMsg)) return; //ConsoleLog.Info("正在加载数据库配置信息..."); - List? Configs = _appconfigDao.Query(); + List? Configs = appConfigDao.Query(); if (Configs == default) { _errMsg = "加载 Config 资源失败，请检查数据库服务器连接是否正常"; @@ -171,7 +160,7 @@ public class ServiceStart(WcsCirculation wcsCirculation, ConnectPLCs connectPLCs { if (!string.IsNullOrEmpty(_errMsg)) return; //ConsoleLog.Info("正在加载堆垛机参数信息..."); - List? appStackers = _appStackerDao.Select(); + List? appStackers = appStackerDao.Select(); if (appStackers == default) { _errMsg = "加载堆垛机参数信息失败，请检查数据库服务器连接是否正常"; @@ -189,7 +178,7 @@ public class ServiceStart(WcsCirculation wcsCirculation, ConnectPLCs connectPLCs { if (!string.IsNullOrEmpty(_errMsg)) return; //ConsoleLog.Info("正在加载库位信息..."); - List? appLocations = _applocationDao.Select(); + List? appLocations = appLocationDao.Select(); if (appLocations == default) { _errMsg = "加载库位信息失败，请检查数据库服务器连接是否正常"; @@ -206,7 +195,7 @@ public class ServiceStart(WcsCirculation wcsCirculation, ConnectPLCs connectPLCs { if (!string.IsNullOrEmpty(_errMsg)) return; //ConsoleLog.Info("正在电子标签基础资料信息..."); - List? eltags = _appElTagBaseDao.Query(); + List? eltags = appElTagBaseDao.Query(); if (eltags == default) { _errMsg = "加载电子标签基础信息失败，请检查数据库服务器连接是否正常"; @@ -224,7 +213,7 @@ public class ServiceStart(WcsCirculation wcsCirculation, ConnectPLCs connectPLCs { if (!string.IsNullOrEmpty(_errMsg)) return; //ConsoleLog.Info("正在加载输送线基础资料信息..."); - List? appConveyStands = _conveyStandDao.Query(); + List? appConveyStands = conveyStandDao.Query(); if (appConveyStands == default) { _errMsg = "加载输送线站台基础资料信息失败，请检查数据库服务器连接是否正常";