diff --git a/wcs/src/main/java/org/wcs/serve/controller/app/StackerController.java b/wcs/src/main/java/org/wcs/serve/controller/app/StackerController.java index b7c66d7..f859a43 100644 --- a/wcs/src/main/java/org/wcs/serve/controller/app/StackerController.java +++ b/wcs/src/main/java/org/wcs/serve/controller/app/StackerController.java @@ -1,5 +1,6 @@ package org.wcs.serve.controller.app; +import cn.dev33.satoken.annotation.SaCheckPermission; import jakarta.validation.constraints.NotBlank; import jakarta.validation.constraints.NotNull; import lombok.RequiredArgsConstructor; @@ -33,6 +34,7 @@ public class StackerController { * @param stackerName 堆垛机名称 * @return 查询结果 */ + @SaCheckPermission("stackerManage:queryStacker") @GetMapping("/queryStackerInfo") public AppServeDataResponse> queryStackerInfo(@RequestParam("stackerName") String stackerName) { return stackerService.queryStackerInfo(stackerName); @@ -43,6 +45,7 @@ public class StackerController { * @param addStackerReq 添加堆垛机请求参数 * @return 添加结果 */ + @SaCheckPermission("stackerManage:addStacker") @PostMapping("/addStackerInfo") public AppServeResponse addStackerInfo(@RequestBody @Validated AddStackerReq addStackerReq) { return stackerService.addStacker(addStackerReq); @@ -53,6 +56,7 @@ public class StackerController { * @param updateStackerInfoReq 更新堆垛机请求参数 * @return 更新结果 */ + @SaCheckPermission("stackerManage:editStacker") @PostMapping("/updateStackerInfo") public AppServeResponse updateStackerInfo(@RequestBody @Validated UpdateStackerInfoReq updateStackerInfoReq) { return stackerService.updateStackerInfo(updateStackerInfoReq); @@ -63,6 +67,7 @@ public class StackerController { * @param stackerId 堆垛机ID * @return 查询结果 */ + @SaCheckPermission("stackerManage:queryStand") @GetMapping("/queryStackerStand") public AppServeDataResponse> queryStackerStand(@RequestParam("stackerId") @NotNull(message = "堆垛机ID不能为空") Integer stackerId) { return stackerService.queryStackerStand(stackerId); @@ -73,6 +78,7 @@ public class StackerController { * @param addOrUpdateStackerStandReq 堆垛机站台 * @return 操作结果 */ + @SaCheckPermission("stackerManage:editStand") @PostMapping("/addOrUpdateStackerStand") public AppServeResponse addOrUpdateStackerStand(@RequestBody @Validated AddOrUpdateStackerStandReq addOrUpdateStackerStandReq) { return stackerService.addOrUpdateStackerStand(addOrUpdateStackerStandReq); @@ -83,6 +89,7 @@ public class StackerController { * @param standId 堆垛机站台ID * @return 操作结果 */ + @SaCheckPermission("stackerManage:deleteStand") @DeleteMapping("/deleteWithStandId/{standId}") public AppServeResponse deleteWithStandId(@PathVariable @NotBlank(message = "堆垛机站台ID不能为空") String standId) { return stackerService.deleteWithStandId(standId); @@ -92,6 +99,7 @@ public class StackerController { * 获取堆垛机运行信息 * @return 堆垛机运行信息 */ + @SaCheckPermission("stackerManage:queryStackerStatus") @GetMapping("/getStackerRunningInfo") public AppServeDataResponse> getStackerRunningInfo() { return stackerService.getStackerRunningInfo(); diff --git a/wcs/src/main/java/org/wcs/serve/controller/app/StackerLocationController.java b/wcs/src/main/java/org/wcs/serve/controller/app/StackerLocationController.java index 87d2832..6a8ad19 100644 --- a/wcs/src/main/java/org/wcs/serve/controller/app/StackerLocationController.java +++ b/wcs/src/main/java/org/wcs/serve/controller/app/StackerLocationController.java @@ -1,5 +1,6 @@ package org.wcs.serve.controller.app; +import cn.dev33.satoken.annotation.SaCheckPermission; import jakarta.servlet.http.HttpServletResponse; import jakarta.validation.constraints.NotNull; import lombok.RequiredArgsConstructor; @@ -35,6 +36,7 @@ public class StackerLocationController { * @param pageIndex 页面序号 * @return 查询结果 */ + @SaCheckPermission("stackerLocationManage:queryTable") @PostMapping("queryStackerLocation") public AppServeDataResponse> queryStackerLocation(@RequestBody QueryStackerLocationReq request, @RequestParam("pageSize") Integer pageSize, @RequestParam("pageIndex") Integer pageIndex) { return stackerLocationService.queryStackerLocation(request, pageSize, pageIndex); @@ -45,6 +47,7 @@ public class StackerLocationController { * @param request 请求参数 * @param response 响应 */ + @SaCheckPermission("stackerLocationManage:export") @PostMapping("downloadStackerLocation") public void downloadStackerLocation(HttpServletResponse response, @RequestBody QueryStackerLocationReq request) { stackerLocationService.downloadStackerLocation(response, request); @@ -55,6 +58,7 @@ public class StackerLocationController { * @param request 新增参数 * @return 新增结果 */ + @SaCheckPermission("stackerLocationManage:add") @PostMapping("addStackerLocation") public AppServeResponse addStackerLocation(@RequestBody @Validated AddStackerLocationReq request) { return stackerLocationService.addStackerLocation(request); @@ -65,6 +69,7 @@ public class StackerLocationController { * @param request 新增参数 * @return 新增结果 */ + @SaCheckPermission("stackerLocationManage:add") @PostMapping("addStackerLocations") public AppServeResponse addStackerLocations(@RequestBody @Validated AddManyStackerLocationsReq request) { return stackerLocationService.addStackerLocations(request); @@ -75,6 +80,7 @@ public class StackerLocationController { * @param request 修改参数 * @return 修改结果 */ + @SaCheckPermission("stackerLocationManage:edit") @PostMapping("updateStackerLocation") public AppServeResponse updateStackerLocation(@RequestBody @Validated UpdateStackerLocationReq request) { return stackerLocationService.updateStackerLocation(request); @@ -85,6 +91,7 @@ public class StackerLocationController { * @param laneId 巷道号 * @return 查询结果 */ + @SaCheckPermission("stackerLocationManage:queryMap") @GetMapping("queryStackerLocationListByStackerIdAndLaneId") public AppServeDataResponse> queryStackerLocationListByStackerIdAndLaneId(@RequestParam @NotNull(message = "设备号不能为空") Integer stackerId, @RequestParam @NotNull(message = "巷道号不能为空") Integer laneId) { return stackerLocationService.queryStackerLocationListByStackerIdAndLaneId(stackerId, laneId); @@ -95,11 +102,17 @@ public class StackerLocationController { * @param stackerId 设备号 * @return 巷道列表 */ + @SaCheckPermission("stackerLocationManage:queryMap") @GetMapping("queryStackerLocationLaneList") public AppServeDataResponse> queryStackerLocationLaneList(@RequestParam @NotNull(message = "设备号不能为空") Integer stackerId) { return stackerLocationService.queryStackerLocationLaneList(stackerId); } + /** + * 查询堆垛机库位设备列表 + * @return 设备列表 + */ + @SaCheckPermission("stackerLocationManage:queryMap") @GetMapping("queryStackerLocationStackerIdList") public AppServeDataResponse> queryStackerLocationStackerIdList() { return stackerLocationService.queryStackerLocationStackerIdList(); diff --git a/wcs/src/main/java/org/wcs/serve/controller/app/StockComposeTaskController.java b/wcs/src/main/java/org/wcs/serve/controller/app/StockComposeTaskController.java index 2433261..1de7153 100644 --- a/wcs/src/main/java/org/wcs/serve/controller/app/StockComposeTaskController.java +++ b/wcs/src/main/java/org/wcs/serve/controller/app/StockComposeTaskController.java @@ -1,6 +1,7 @@ package org.wcs.serve.controller.app; +import cn.dev33.satoken.annotation.SaCheckPermission; import jakarta.servlet.http.HttpServletResponse; import jakarta.validation.constraints.NotBlank; import lombok.RequiredArgsConstructor; @@ -37,6 +38,7 @@ public class StockComposeTaskController { * @param pageIndex 页码 * @return 查询结果 */ + @SaCheckPermission("stockComposeTask:query") @PostMapping("/query") public AppServeDataResponse> query(@RequestBody QueryStockComposeTaskReq queryTaskReq, @RequestParam("pageSize") Integer pageSize, @RequestParam("pageIndex") Integer pageIndex) { return stockComposeTaskService.query(queryTaskReq, pageSize, pageIndex); @@ -49,6 +51,7 @@ public class StockComposeTaskController { * @param pageIndex 页码 * @return 查询结果 */ + @SaCheckPermission("stockComposeTaskBak:query") @PostMapping("/queryBak") public AppServeDataResponse> queryBak(@RequestBody QueryStockComposeTaskReq queryTaskReq, @RequestParam("pageSize") Integer pageSize, @RequestParam("pageIndex") Integer pageIndex) { return stockComposeTaskService.queryBak(queryTaskReq, pageSize, pageIndex); @@ -60,6 +63,7 @@ public class StockComposeTaskController { * @param response 响应 * @param queryTaskReq 查询任务请求 */ + @SaCheckPermission("stockComposeTask:export") @PostMapping("/downLoadTask") public void downLoadTask(HttpServletResponse response, @RequestBody QueryStockComposeTaskReq queryTaskReq) { stockComposeTaskService.downLoadTask(response, queryTaskReq); @@ -71,6 +75,7 @@ public class StockComposeTaskController { * @param response 响应 * @param queryTaskReq 查询任务请求 */ + @SaCheckPermission("stockComposeTaskBak:export") @PostMapping("/downLoadTaskBak") public void downLoadTaskBak(HttpServletResponse response, @RequestBody QueryStockComposeTaskReq queryTaskReq) { stockComposeTaskService.downLoadTaskBak(response, queryTaskReq); @@ -82,6 +87,7 @@ public class StockComposeTaskController { * @param addTaskReq 添加任务参数 * @return 添加结果 */ + @SaCheckPermission("stockComposeTask:add") @PostMapping("/addTask") public AppServeResponse addTask(@RequestBody @Validated AddStockComposeTaskReq addTaskReq) { return stockComposeTaskService.addTask(addTaskReq); @@ -92,6 +98,7 @@ public class StockComposeTaskController { * @param taskId 任务ID * @return 取消结果 */ + @SaCheckPermission("stockComposeTask:edit") @PutMapping("/cancelTask") public AppServeResponse cancelTask(@RequestParam String taskId) { return stockComposeTaskService.cancelTask(taskId); @@ -102,6 +109,7 @@ public class StockComposeTaskController { * @param taskId 任务ID * @return 完成结果 */ + @SaCheckPermission("stockComposeTask:edit") @PutMapping("/completeTask") public AppServeResponse completeTask(@RequestParam String taskId) { return stockComposeTaskService.completeTask(taskId); @@ -112,6 +120,7 @@ public class StockComposeTaskController { * @param taskId 任务ID * @return 重置结果 */ + @SaCheckPermission("stockComposeTask:edit") @PutMapping("/resetTask") public AppServeResponse resetTask(@RequestParam String taskId) { return stockComposeTaskService.resetTask(taskId); @@ -122,6 +131,7 @@ public class StockComposeTaskController { * @param reporterTaskStatusReq 状态报告参数 * @return 状态报告结果 */ + @SaCheckPermission("stockComposeTask:upload") @PostMapping("/reporterTaskCompleted") public AppServeResponse reporterTaskCompleted(@RequestBody @Validated ReporterTaskStatusReq reporterTaskStatusReq) { return stockComposeTaskService.reporterTaskCompleted(reporterTaskStatusReq); @@ -132,6 +142,7 @@ public class StockComposeTaskController { * @param reporterTaskStatusReq 状态报告参数 * @return 状态报告结果 */ + @SaCheckPermission("stockComposeTask:upload") @PostMapping("/reporterTaskCancel") public AppServeResponse reporterTaskCancel(@RequestBody @Validated ReporterTaskStatusReq reporterTaskStatusReq) { return stockComposeTaskService.reporterTaskCancel(reporterTaskStatusReq); @@ -142,6 +153,7 @@ public class StockComposeTaskController { * @param reporterTaskStatusReq 状态报告参数 * @return 状态报告结果 */ + @SaCheckPermission("stockComposeTaskBak:upload") @PostMapping("/reporterTaskBakCompleted") public AppServeResponse reporterTaskBakCompleted(@RequestBody @Validated ReporterTaskStatusReq reporterTaskStatusReq) { return stockComposeTaskService.reporterTaskBakCompleted(reporterTaskStatusReq); @@ -152,6 +164,7 @@ public class StockComposeTaskController { * @param reporterTaskStatusReq 状态报告参数 * @return 状态报告结果 */ + @SaCheckPermission("stockComposeTaskBak:upload") @PostMapping("/reporterTaskBakCancel") public AppServeResponse reporterTaskBakCancel(@RequestBody @Validated ReporterTaskStatusReq reporterTaskStatusReq) { return stockComposeTaskService.reporterTaskBakCancel(reporterTaskStatusReq); diff --git a/wcs/src/main/java/org/wcs/serve/controller/app/StockScanController.java b/wcs/src/main/java/org/wcs/serve/controller/app/StockScanController.java index 3238393..4ab5433 100644 --- a/wcs/src/main/java/org/wcs/serve/controller/app/StockScanController.java +++ b/wcs/src/main/java/org/wcs/serve/controller/app/StockScanController.java @@ -1,6 +1,7 @@ package org.wcs.serve.controller.app; +import cn.dev33.satoken.annotation.SaCheckPermission; import jakarta.validation.constraints.NotBlank; import lombok.RequiredArgsConstructor; import org.springframework.validation.annotation.Validated; @@ -35,11 +36,16 @@ public class StockScanController { * @param pageIndex 当前页码 * @return 查询结果 */ + @SaCheckPermission("stockScanManage:query") @PostMapping("/queryWithPage") public AppServeDataResponse> queryStockScan(@RequestBody QueryStockScanReq request, @RequestParam("pageSize") Integer pageSize, @RequestParam("pageIndex") Integer pageIndex) { return stockScanService.queryStockScan(request, pageSize, pageIndex); } + /** + * 查询所有扫码配置信息 + * @return 查询结果 + */ @GetMapping("/queryAll") public AppServeDataResponse> queryStockScanAll() { return stockScanService.queryStockScan(); @@ -59,6 +65,7 @@ public class StockScanController { * @param request 新增参数 * @return 新增结果 */ + @SaCheckPermission("stockScanManage:add") @PostMapping("/addStockScan") public AppServeResponse addStockScan(@RequestBody @Validated AddStockScanReq request) { return stockScanService.addStockScan(request); @@ -69,6 +76,7 @@ public class StockScanController { * @param request 修改参数 * @return 修改结果 */ + @SaCheckPermission("stockScanManage:edit") @PostMapping("/updateStockScan") public AppServeResponse updateStockScan(@RequestBody @Validated UpdateStockScanReq request) { return stockScanService.updateStockScan(request); @@ -79,6 +87,7 @@ public class StockScanController { * @param stockScanId 仓库扫码ID * @return 删除结果 */ + @SaCheckPermission("stockScanManage:delete") @DeleteMapping("/deleteStockScan") public AppServeResponse deleteStockScan(@RequestParam("stockScanId") @NotBlank(message = "仓库扫码ID不能为空") String stockScanId) { return stockScanService.deleteStockScan(stockScanId); diff --git a/wcs/src/main/java/org/wcs/serve/controller/app/StockSingleTaskController.java b/wcs/src/main/java/org/wcs/serve/controller/app/StockSingleTaskController.java index 9a201e5..54faaa7 100644 --- a/wcs/src/main/java/org/wcs/serve/controller/app/StockSingleTaskController.java +++ b/wcs/src/main/java/org/wcs/serve/controller/app/StockSingleTaskController.java @@ -1,6 +1,7 @@ package org.wcs.serve.controller.app; +import cn.dev33.satoken.annotation.SaCheckPermission; import jakarta.servlet.http.HttpServletResponse; import jakarta.validation.constraints.NotNull; import lombok.RequiredArgsConstructor; @@ -29,6 +30,7 @@ public class StockSingleTaskController { * @param pageIndex 页码 * @return 结果 */ + @SaCheckPermission("stockSingleTask:query") @PostMapping("/query") public AppServeDataResponse> query(@RequestBody QueryStockSingleTaskReq request, @RequestParam("pageSize") @NotNull(message = "分页单页大小不能为空") Integer pageSize , @RequestParam("pageIndex") @NotNull(message = "分页页码不能为空") Integer pageIndex) { return stockSingleTaskService.query(request, pageSize, pageIndex); @@ -41,6 +43,7 @@ public class StockSingleTaskController { * @param pageIndex 页码 * @return 结果 */ + @SaCheckPermission("stockSingleTaskBak:query") @PostMapping("/queryBak") public AppServeDataResponse> queryBak(@RequestBody QueryStockSingleTaskReq request, @RequestParam("pageSize") @NotNull(message = "分页单页大小不能为空") Integer pageSize , @RequestParam("pageIndex") @NotNull(message = "分页页码不能为空") Integer pageIndex) { return stockSingleTaskService.queryBak(request, pageSize, pageIndex); @@ -50,6 +53,7 @@ public class StockSingleTaskController { * 下载任务 * @param request 添加单任务数据 */ + @SaCheckPermission("stockSingleTaskBak:export") @PostMapping("/downLoadBak") public void downLoadBak(HttpServletResponse response, @RequestBody QueryStockSingleTaskReq request) { stockSingleTaskService.downLoadBak(response, request); @@ -60,6 +64,7 @@ public class StockSingleTaskController { * @param request 添加单任务数据 * @return 结果 */ + @SaCheckPermission("stockSingleTask:add") @PostMapping("/addSingleTask") public AppServeResponse addSingleTask(@RequestBody @Validated AddSingleTaskReq request) { return stockSingleTaskService.addSingleTask(request); @@ -81,6 +86,7 @@ public class StockSingleTaskController { * @param taskStatus 任务状态 * @return 结果 */ + @SaCheckPermission("stockSingleTask:edit") @PutMapping("/updateTaskStatus") public AppServeResponse updateTaskStatus(@RequestParam("taskId") String taskId, @RequestParam("taskStatus") Integer taskStatus) { return stockSingleTaskService.updateTaskStatus(taskId, taskStatus); @@ -91,6 +97,7 @@ public class StockSingleTaskController { * @param taskId 要完成的任务号 * @return 结果 */ + @SaCheckPermission("stockSingleTask:edit") @PutMapping("/completeTask/{taskId}") public AppServeResponse completeTask(@PathVariable String taskId) { return stockSingleTaskService.completeTask(taskId); @@ -101,6 +108,7 @@ public class StockSingleTaskController { * @param taskId 要取消的任务号 * @return 结果 */ + @SaCheckPermission("stockSingleTask:edit") @PutMapping("/cancelTask/{taskId}") public AppServeResponse cancelTask(@PathVariable String taskId) { return stockSingleTaskService.cancelTask(taskId); diff --git a/wcs/src/main/java/org/wcs/serve/controller/app/TrayConveyLocationController.java b/wcs/src/main/java/org/wcs/serve/controller/app/TrayConveyLocationController.java index 23f4628..980a3fd 100644 --- a/wcs/src/main/java/org/wcs/serve/controller/app/TrayConveyLocationController.java +++ b/wcs/src/main/java/org/wcs/serve/controller/app/TrayConveyLocationController.java @@ -1,5 +1,6 @@ package org.wcs.serve.controller.app; +import cn.dev33.satoken.annotation.SaCheckPermission; import jakarta.servlet.http.HttpServletResponse; import jakarta.validation.constraints.NotBlank; import lombok.RequiredArgsConstructor; @@ -30,6 +31,7 @@ public class TrayConveyLocationController { * @param pageIndex 分页页码 * @return 结果 */ + @SaCheckPermission("trayConveyManage:query") @PostMapping("queryTrayConveyLocation") public AppServeDataResponse> queryTrayConveyLocation(@RequestBody QueryTrayConveyLocationReq request, @RequestParam("pageSize") Integer pageSize, @RequestParam("pageIndex") Integer pageIndex) { return trayConveyLocationService.queryTrayConveyLocation(request, pageSize, pageIndex); @@ -40,6 +42,7 @@ public class TrayConveyLocationController { * @param request 新增参数 * @return 结果 */ + @SaCheckPermission("trayConveyManage:add") @PostMapping("addTrayConveyLocation") public AppServeResponse addTrayConveyLocation(@RequestBody @Validated AddTrayConveyLocationReq request) { return trayConveyLocationService.addTrayConveyLocation(request); @@ -50,6 +53,7 @@ public class TrayConveyLocationController { * @param request 修改参数 * @return 结果 */ + @SaCheckPermission("trayConveyManage:edit") @PostMapping("updateTrayConveyLocation") public AppServeResponse updateTrayConveyLocation(@RequestBody @Validated UpdateTrayConveyLocationReq request) { return trayConveyLocationService.updateTrayConveyLocation(request); @@ -60,6 +64,7 @@ public class TrayConveyLocationController { * @param conveyId 输送点位ID * @return 状态数据 */ + @SaCheckPermission("trayConveyManage:queryStatus") @GetMapping("queryTrayConveyStatus") public AppServeDataResponse queryTrayConveyStatus(@RequestParam("conveyId") @NotBlank(message = "输送点位ID不能为空") String conveyId) { return trayConveyLocationService.queryTrayConveyStatus(conveyId); @@ -70,6 +75,7 @@ public class TrayConveyLocationController { * @param request 查询参数 * @param response 响应对象 */ + @SaCheckPermission("trayConveyManage:export") @PostMapping("downloadTrayConveyLocation") public void downLoadTrayConveyLocation(HttpServletResponse response, @RequestBody QueryTrayConveyLocationReq request) { trayConveyLocationService.downLoadTrayConveyLocation(response, request); diff --git a/wcs/src/main/java/org/wcs/serve/controller/app/UserController.java b/wcs/src/main/java/org/wcs/serve/controller/app/UserController.java index 883d9a0..082b4d8 100644 --- a/wcs/src/main/java/org/wcs/serve/controller/app/UserController.java +++ b/wcs/src/main/java/org/wcs/serve/controller/app/UserController.java @@ -1,5 +1,6 @@ package org.wcs.serve.controller.app; +import cn.dev33.satoken.annotation.SaCheckPermission; import jakarta.validation.constraints.NotBlank; import lombok.RequiredArgsConstructor; import org.springframework.validation.annotation.Validated; @@ -47,6 +48,7 @@ public class UserController { * @param queryUserReq 查询用户请求 * @return 返回结果 */ + @SaCheckPermission("userManage:query") @PostMapping("/queryUser") public AppServeDataResponse> queryUser(@RequestBody QueryUserReq queryUserReq) { return userService.queryUser(queryUserReq); @@ -57,16 +59,27 @@ public class UserController { * @param userId 用户ID * @return 登出结果 */ + @SaCheckPermission("userManage:edit") @PutMapping("/logoutUser/{userId}") public AppServeResponse logoutUser(@PathVariable @NotBlank(message = "用户ID不能为空") String userId) { return userService.logoutUser(userId); } + /** + * 登出自己 + * @return 登出结果 + */ + @PostMapping("/logout") + public AppServeResponse logout() { + return userService.logout(); + } + /** * 修改用户信息 * @param updateUserReq 修改用户信息请求 * @return 修改结果 */ + @SaCheckPermission("userManage:edit") @PostMapping("/updateUser") public AppServeResponse updateUser(@RequestBody @Validated UpdateUserReq updateUserReq) { return userService.updateUser(updateUserReq); @@ -77,6 +90,7 @@ public class UserController { * @param userId 用户ID * @return 删除结果 */ + @SaCheckPermission("userManage:delete") @DeleteMapping("/deleteUser/{userId}") public AppServeResponse deleteUser(@PathVariable @NotBlank(message = "用户ID不能为空") String userId) { return userService.deleteUser(userId); @@ -87,6 +101,7 @@ public class UserController { * @param createUserReq 创建用户的请求 * @return 创建结果 */ + @SaCheckPermission("userManage:add") @PostMapping("/createUser") public AppServeResponse createUser(@RequestBody @Validated CreateUserReq createUserReq) { return userService.createUser(createUserReq); diff --git a/wcs/src/main/java/org/wcs/serve/controller/app/UserGroupController.java b/wcs/src/main/java/org/wcs/serve/controller/app/UserGroupController.java index 2ec7fec..1eee241 100644 --- a/wcs/src/main/java/org/wcs/serve/controller/app/UserGroupController.java +++ b/wcs/src/main/java/org/wcs/serve/controller/app/UserGroupController.java @@ -1,5 +1,6 @@ package org.wcs.serve.controller.app; +import cn.dev33.satoken.annotation.SaCheckPermission; import jakarta.validation.constraints.NotBlank; import lombok.RequiredArgsConstructor; import org.springframework.validation.annotation.Validated; @@ -31,6 +32,7 @@ public class UserGroupController { * 查找用户组级别比自己低的用户的用户组信息 * @return 查询到的信息 */ + @SaCheckPermission("userGroupManage:queryUserGroup") @GetMapping("/queryMinLevelUserGroup") public AppServeDataResponse> queryMinLevelUserGroup() { return userGroupService.queryMinLevelUserGroup(); @@ -51,6 +53,7 @@ public class UserGroupController { * @param addUserGroupReq 新用户组信息 * @return 添加结果 */ + @SaCheckPermission("userGroupManage:addUserGroup") @PostMapping("/addUserGroup") public AppServeResponse addUserGroup(@RequestBody @Validated AddUserGroupReq addUserGroupReq) { return userGroupService.addUserGroup(addUserGroupReq); @@ -61,8 +64,9 @@ public class UserGroupController { * @param userGroup 用户组 * @return 结果 */ + @SaCheckPermission("userGroupManage:deleteUserGroup") @DeleteMapping("/deleteUserGroup/{userGroup}") - public AppServeResponse deleteUserGroup(@PathVariable("userGroup") @NotBlank(message = "用户组不能为空") String userGroup) { + public AppServeResponse deleteUserGroup(@PathVariable @NotBlank(message = "用户组不能为空") String userGroup) { return userGroupService.deleteUserGroup(userGroup); } @@ -71,6 +75,7 @@ public class UserGroupController { * @param updateUserGroupReq 更新信息 * @return 更新结果 */ + @SaCheckPermission("userGroupManage:editUserGroup") @PostMapping("/updateUserGroup") public AppServeResponse updateUserGroup(@RequestBody @Validated UpdateUserGroupReq updateUserGroupReq) { return userGroupService.updateUserGroup(updateUserGroupReq); @@ -81,6 +86,7 @@ public class UserGroupController { * @param updateGroupPermissionReq 更新权限信息 * @return 更新结果 */ + @SaCheckPermission("userGroupManage:editUserGroup") @PostMapping("/updateGroupPermission") public AppServeResponse updateGroupPermission(@RequestBody @Validated UpdateGroupPermissionReq updateGroupPermissionReq) { return userGroupService.updateGroupPermission(updateGroupPermissionReq); @@ -91,6 +97,7 @@ public class UserGroupController { * @param updateGroupPermissionReq 添加权限信息 * @return 添加结果 */ + @SaCheckPermission("userGroupManage:editPermission") @PostMapping("/updateGroupOperationPermission") public AppServeResponse updateGroupOperationPermission(@RequestBody @Validated UpdateGroupPermissionReq updateGroupPermissionReq) { return userGroupService.updateGroupOperationPermission(updateGroupPermissionReq); @@ -101,6 +108,7 @@ public class UserGroupController { * @param groupId 用户组id * @return 查询结果 */ + @SaCheckPermission("userGroupManage:queryPermission") @GetMapping("/queryOperationPermission/{groupId}") public AppServeDataResponse> queryOperationPermission(@PathVariable @NotBlank(message = "用户组id不能为空") String groupId) { return userGroupService.queryOperationPermission(groupId); diff --git a/wcs/src/main/java/org/wcs/serve/service/impl/UserService.java b/wcs/src/main/java/org/wcs/serve/service/impl/UserService.java index 847e30b..52e9544 100644 --- a/wcs/src/main/java/org/wcs/serve/service/impl/UserService.java +++ b/wcs/src/main/java/org/wcs/serve/service/impl/UserService.java @@ -180,6 +180,22 @@ public class UserService implements IUserService { return AppServeResponseFactory.success("用户退出成功"); } + /** + * 登出自己 + * @return 登出结果 + */ + @Override + public AppServeResponse logout() { + Object userIdObj = StpUtil.getLoginId(); + if(userIdObj == null) { + return AppServeResponseFactory.success("用户未登录"); + } + String operationUserId = userIdObj.toString(); + StpUtil.logout(); + log.info("用户:{} 登出", operationUserId); + return AppServeResponseFactory.success("用户退出成功"); + } + /** * 更新用户 * @param updateUserReq 更新用户请求 diff --git a/wcs/src/main/java/org/wcs/serve/service/intf/IUserService.java b/wcs/src/main/java/org/wcs/serve/service/intf/IUserService.java index b9e6752..b85b7ad 100644 --- a/wcs/src/main/java/org/wcs/serve/service/intf/IUserService.java +++ b/wcs/src/main/java/org/wcs/serve/service/intf/IUserService.java @@ -12,6 +12,7 @@ public interface IUserService { AppServeDataResponse permission(); // 获取权限 AppServeDataResponse> queryUser(QueryUserReq queryUserReq); // 查询用户 AppServeResponse logoutUser(String userId); // 登出用户 + AppServeResponse logout(); // 登出自己 AppServeResponse updateUser(UpdateUserReq updateUserReq); // 修改用户信息 AppServeResponse deleteUser(String userId); // 删除用户 AppServeResponse createUser(CreateUserReq createUserReq); // 创建用户 diff --git a/wcs_web/src/api/user.ts b/wcs_web/src/api/user.ts index bb629ff..690dea5 100644 --- a/wcs_web/src/api/user.ts +++ b/wcs_web/src/api/user.ts @@ -23,6 +23,10 @@ export default class UserApi { static queryUserList(userSearch: IUserSearch) { return axiosInstance.post("/app/user/queryUser", userSearch); } + // 登出自己 + static logout() { + return axiosInstance.put("/app/user/logout"); + } // 登出用户 static loginOut(userId: string) { return axiosInstance.put("/app/user/logoutUser/" + userId); diff --git a/wcs_web/src/components/page/app/UserSetting.vue b/wcs_web/src/components/page/app/UserSetting.vue index 3909c25..8b45d98 100644 --- a/wcs_web/src/components/page/app/UserSetting.vue +++ b/wcs_web/src/components/page/app/UserSetting.vue @@ -16,7 +16,7 @@ // 登出用户 const loginOut = () => { MessageUtils.confirmMessageBox(`确定退出账号:${userStoreInstance.getUserInfo().userId}?`, "登出确认").then(() => { - UserApi.loginOut(userStoreInstance.getUserInfo().userId ?? '').then((res) => { + UserApi.logout().then((res) => { const response = JSON.parse(JSON.stringify(res.data)) as AppServeResponse; if (response && response.code == AppServeResponseCodeEnum.SUCCESS) { MessageUtils.successMessage("登出成功"); diff --git a/wcs_web/src/components/page/stacker/AddStackerComponent.vue b/wcs_web/src/components/page/stacker/AddStackerComponent.vue index d8ca1ee..0da33f7 100644 --- a/wcs_web/src/components/page/stacker/AddStackerComponent.vue +++ b/wcs_web/src/components/page/stacker/AddStackerComponent.vue @@ -7,6 +7,7 @@ import MessageUtils from "@/utils/MessageUtils.ts"; import StackerApi from "@/api/stacker.ts"; import type {AppServeResponse} from "@/interface/api/AppServeResponse.ts"; import {AppServeResponseCodeEnum} from "@/constant/enums/AppServeResponseCodeEnum.ts"; +import AppPermission from "@/components/manage/AppPermission.vue"; const modelValue = defineModel('modelValue', {required: true, default: false}); const emit = defineEmits(['reLoadingTableData']); @@ -103,7 +104,7 @@ const add = () => { diff --git a/wcs_web/src/components/page/stacker/StackerDetailComponent.vue b/wcs_web/src/components/page/stacker/StackerDetailComponent.vue index 1f32124..6c5c88a 100644 --- a/wcs_web/src/components/page/stacker/StackerDetailComponent.vue +++ b/wcs_web/src/components/page/stacker/StackerDetailComponent.vue @@ -5,6 +5,7 @@ import MessageUtils from "@/utils/MessageUtils.ts"; import StackerApi from "@/api/stacker.ts"; import type {AppServeResponse} from "@/interface/api/AppServeResponse.ts"; import {AppServeResponseCodeEnum} from "@/constant/enums/AppServeResponseCodeEnum.ts"; +import AppPermission from "@/components/manage/AppPermission.vue"; const modelValue = defineModel('modelValue', {required: true, default: false}); const props = defineProps(['formData']); @@ -98,7 +99,7 @@ const save = () => { diff --git a/wcs_web/src/components/page/stacker/StackerRunningInfo.vue b/wcs_web/src/components/page/stacker/StackerRunningInfo.vue index 5092372..3160817 100644 --- a/wcs_web/src/components/page/stacker/StackerRunningInfo.vue +++ b/wcs_web/src/components/page/stacker/StackerRunningInfo.vue @@ -6,6 +6,7 @@ import StackerApi from "@/api/stacker.ts"; import type {AppServeDataResponse} from "@/interface/api/AppServeDataResponse.ts"; import {AppServeResponseCodeEnum} from "@/constant/enums/AppServeResponseCodeEnum.ts"; import MessageUtils from "@/utils/MessageUtils.ts"; +import AppPermission from "@/components/manage/AppPermission.vue"; const modelValue = defineModel('modelValue', {required: true, default: false}); const close = () => { modelValue.value = false; }; @@ -47,7 +48,7 @@ const query = () => { diff --git a/wcs_web/src/components/page/stacker/StackerStandComponent.vue b/wcs_web/src/components/page/stacker/StackerStandComponent.vue index eef43e0..1e63356 100644 --- a/wcs_web/src/components/page/stacker/StackerStandComponent.vue +++ b/wcs_web/src/components/page/stacker/StackerStandComponent.vue @@ -10,6 +10,7 @@ import MessageUtils from "@/utils/MessageUtils.ts"; import StackerInTypeFormatter from "@/plugin/formatter/StackerInTypeFormatter.ts"; import type {AppServeResponse} from "@/interface/api/AppServeResponse.ts"; import StringUtils from "@/utils/StringUtils.ts"; +import AppPermission from "@/components/manage/AppPermission.vue"; const trueFalseTagStyleFormatter = new TrueFalseTagStyleFormatter(); // 是否枚举格式化 const stackerInTypeFormatter = new StackerInTypeFormatter(); // 入库方式 @@ -206,14 +207,14 @@ const queryStandStatus = () => { 重置输入框 - 添加/保存 + 添加/保存 - 查看/刷新站台 - 查看站台状态 + 查看/刷新站台 + 查看站台状态 @@ -257,8 +258,8 @@ const queryStandStatus = () => { diff --git a/wcs_web/src/components/page/stackerLocation/AddStackerLocationComponent.vue b/wcs_web/src/components/page/stackerLocation/AddStackerLocationComponent.vue index dc654a1..cc93a25 100644 --- a/wcs_web/src/components/page/stackerLocation/AddStackerLocationComponent.vue +++ b/wcs_web/src/components/page/stackerLocation/AddStackerLocationComponent.vue @@ -8,6 +8,7 @@ import StackerLocationApi from "@/api/stackerLocation.ts"; import type {AppServeResponse} from "@/interface/api/AppServeResponse.ts"; import {AppServeResponseCodeEnum} from "@/constant/enums/AppServeResponseCodeEnum.ts"; import type IStackerLocationCreateParams from "@/interface/page/stackerLocation/IStackerLocationCreateParams.ts"; +import AppPermission from "@/components/manage/AppPermission.vue"; const modelValue = defineModel('modelValue', {required: true, default: false}); const emit = defineEmits(['reLoadingTableData']); @@ -124,7 +125,7 @@ const addMany = () => { - 添加一个 + 添加一个 @@ -186,7 +187,7 @@ const addMany = () => { - 批量添加 + 批量添加 diff --git a/wcs_web/src/components/page/stackerLocation/StackerLocationDetailComponent.vue b/wcs_web/src/components/page/stackerLocation/StackerLocationDetailComponent.vue index 2bbfa21..c980baa 100644 --- a/wcs_web/src/components/page/stackerLocation/StackerLocationDetailComponent.vue +++ b/wcs_web/src/components/page/stackerLocation/StackerLocationDetailComponent.vue @@ -5,6 +5,7 @@ import MessageUtils from "@/utils/MessageUtils.ts"; import StackerLocationApi from "@/api/stackerLocation.ts"; import {AppServeResponseCodeEnum} from "@/constant/enums/AppServeResponseCodeEnum.ts"; import type {AppServeResponse} from "@/interface/api/AppServeResponse.ts"; +import AppPermission from "@/components/manage/AppPermission.vue"; const modelValue = defineModel('modelValue', {required: true, default: false}); const emit = defineEmits(['reLoadingTableData']); @@ -95,8 +96,8 @@ const save = () => { diff --git a/wcs_web/src/components/page/stockComposeTask/AddStockComposeTaskComponent.vue b/wcs_web/src/components/page/stockComposeTask/AddStockComposeTaskComponent.vue index 50601c7..1735f49 100644 --- a/wcs_web/src/components/page/stockComposeTask/AddStockComposeTaskComponent.vue +++ b/wcs_web/src/components/page/stockComposeTask/AddStockComposeTaskComponent.vue @@ -8,6 +8,7 @@ import MessageUtils from "@/utils/MessageUtils.ts"; import StockComposeTaskApi from "@/api/stockComposeTask.ts"; import type {AppServeResponse} from "@/interface/api/AppServeResponse.ts"; import {AppServeResponseCodeEnum} from "@/constant/enums/AppServeResponseCodeEnum.ts"; +import AppPermission from "@/components/manage/AppPermission.vue"; const stockComposeTaskTypeFormatter = new StockComposeTaskTypeFormatter(); const modelValue = defineModel('modelValue', {required: true, default: false}); @@ -80,7 +81,7 @@ const add = () => { diff --git a/wcs_web/src/components/page/stockComposeTask/StockComposeTaskBakDetailComponent.vue b/wcs_web/src/components/page/stockComposeTask/StockComposeTaskBakDetailComponent.vue index 80122d0..7a1d1e2 100644 --- a/wcs_web/src/components/page/stockComposeTask/StockComposeTaskBakDetailComponent.vue +++ b/wcs_web/src/components/page/stockComposeTask/StockComposeTaskBakDetailComponent.vue @@ -10,6 +10,7 @@ import MessageUtils from "@/utils/MessageUtils.ts"; import {AppServeResponseCodeEnum} from "@/constant/enums/AppServeResponseCodeEnum.ts"; import type {AppServeResponse} from "@/interface/api/AppServeResponse.ts"; import type {ReporterTaskStatusReq} from "@/interface/page/stockTask/IReporterTaskStatusReq.ts"; +import AppPermission from "@/components/manage/AppPermission.vue"; const modelValue = defineModel('modelValue', {required: true, default: false}); const props = defineProps(['formData']); @@ -153,25 +154,27 @@ const reportTaskCancel = () => { - - -
上报附加信息:
- + + + +
上报附加信息:
+ +
+ +
终点(仅上报完成有效):
+ +
+ + + 上报任务完成 + 上报任务取消 + + + + 此处仅上报不会更新任务状态,点击下方【完成任务】或者【取消任务】按钮时将会自动上报并更新任务状态 +
- -
终点(仅上报完成有效):
- -
- - - 上报任务完成 - 上报任务取消 - - - - 此处仅上报不会更新任务状态,点击下方【完成任务】或者【取消任务】按钮时将会自动上报并更新任务状态 - -
+
diff --git a/wcs_web/src/components/page/stockComposeTask/StockComposeTaskDetailComponent.vue b/wcs_web/src/components/page/stockComposeTask/StockComposeTaskDetailComponent.vue index 5590415..58bcf15 100644 --- a/wcs_web/src/components/page/stockComposeTask/StockComposeTaskDetailComponent.vue +++ b/wcs_web/src/components/page/stockComposeTask/StockComposeTaskDetailComponent.vue @@ -12,6 +12,7 @@ import type {AppServeResponse} from "@/interface/api/AppServeResponse.ts"; import type {ReporterTaskStatusReq} from "@/interface/page/stockTask/IReporterTaskStatusReq.ts"; import type {AppServeDataResponse} from "@/interface/api/AppServeDataResponse.ts"; import type {ICourseCalculateResult} from "@/interface/page/stockTask/ICourseCalculateResult.ts"; +import AppPermission from "@/components/manage/AppPermission.vue"; const modelValue = defineModel('modelValue', {required: true, default: false}); const props = defineProps(['formData']); @@ -235,26 +236,29 @@ const open = () => { + - - -
上报附加信息:
- + + + +
上报附加信息:
+ +
+ +
终点(仅上报完成有效):
+ +
+ + + 上报任务完成 + 上报任务取消 + + + + 此处仅上报不会更新任务状态,点击下方【完成任务】或者【取消任务】按钮时将会自动上报并更新任务状态 +
- -
终点(仅上报完成有效):
- -
- - - 上报任务完成 - 上报任务取消 - - - - 此处仅上报不会更新任务状态,点击下方【完成任务】或者【取消任务】按钮时将会自动上报并更新任务状态 - -
+ 模拟路径计算: @@ -269,9 +273,9 @@ const open = () => { diff --git a/wcs_web/src/components/page/stockScan/AddStockScan.vue b/wcs_web/src/components/page/stockScan/AddStockScan.vue index 72c5e20..354d20b 100644 --- a/wcs_web/src/components/page/stockScan/AddStockScan.vue +++ b/wcs_web/src/components/page/stockScan/AddStockScan.vue @@ -9,6 +9,7 @@ import type {AppServeDataResponse} from "@/interface/api/AppServeDataResponse.ts import {AppServeResponseCodeEnum} from "@/constant/enums/AppServeResponseCodeEnum.ts"; import MessageUtils from "@/utils/MessageUtils.ts"; import type {AppServeResponse} from "@/interface/api/AppServeResponse.ts"; +import AppPermission from "@/components/manage/AppPermission.vue"; const modelValue = defineModel('modelValue', {required: true, default: false}); const emit = defineEmits(['reLoadingTableData']); @@ -177,7 +178,7 @@ onMounted(() => { diff --git a/wcs_web/src/components/page/stockScan/StockScanDetail.vue b/wcs_web/src/components/page/stockScan/StockScanDetail.vue index fea7043..dc34183 100644 --- a/wcs_web/src/components/page/stockScan/StockScanDetail.vue +++ b/wcs_web/src/components/page/stockScan/StockScanDetail.vue @@ -10,6 +10,7 @@ import {AppServeResponseCodeEnum} from "@/constant/enums/AppServeResponseCodeEnu import MessageUtils from "@/utils/MessageUtils.ts"; import type {AppServeResponse} from "@/interface/api/AppServeResponse.ts"; import {FormatterUtils} from "@/utils/FormatterUtils.ts"; +import AppPermission from "@/components/manage/AppPermission.vue"; const modelValue = defineModel('modelValue', {required: true, default: false}); const formData = defineModel('formData', {required: true, default: () => {}}) @@ -185,8 +186,8 @@ const deleteData = () => { diff --git a/wcs_web/src/components/page/stockSingleTask/AddStockSingleTaskComponent.vue b/wcs_web/src/components/page/stockSingleTask/AddStockSingleTaskComponent.vue index 42bd7e5..811c86e 100644 --- a/wcs_web/src/components/page/stockSingleTask/AddStockSingleTaskComponent.vue +++ b/wcs_web/src/components/page/stockSingleTask/AddStockSingleTaskComponent.vue @@ -9,6 +9,7 @@ import MessageUtils from "@/utils/MessageUtils.ts"; import StockSingleTaskApi from "@/api/stockSingleTask.ts"; import type {AppServeResponse} from "@/interface/api/AppServeResponse.ts"; import {AppServeResponseCodeEnum} from "@/constant/enums/AppServeResponseCodeEnum.ts"; +import AppPermission from "@/components/manage/AppPermission.vue"; const stockSingleTaskExecuteMachineFormatter = new StockSingleTaskExecuteMachineFormatter(); const stockSingleTaskTypeFormatter = new StockSingleTaskTypeFormatter(); @@ -88,7 +89,7 @@ const add = () => { diff --git a/wcs_web/src/components/page/stockSingleTask/StockSingleTaskDetailComponent.vue b/wcs_web/src/components/page/stockSingleTask/StockSingleTaskDetailComponent.vue index 4516545..589f601 100644 --- a/wcs_web/src/components/page/stockSingleTask/StockSingleTaskDetailComponent.vue +++ b/wcs_web/src/components/page/stockSingleTask/StockSingleTaskDetailComponent.vue @@ -9,6 +9,7 @@ import MessageUtils from "@/utils/MessageUtils.ts"; import StockSingleTaskApi from "@/api/stockSingleTask.ts"; import type {AppServeResponse} from "@/interface/api/AppServeResponse.ts"; import {AppServeResponseCodeEnum} from "@/constant/enums/AppServeResponseCodeEnum.ts"; +import AppPermission from "@/components/manage/AppPermission.vue"; const modelValue = defineModel('modelValue', {required: true, default: false}); const props = defineProps(['formData']); @@ -147,9 +148,11 @@ const updateTaskStatus = () => {
- - 修改状态 - + + + 修改状态 + + @@ -203,8 +206,8 @@ const updateTaskStatus = () => { diff --git a/wcs_web/src/components/page/trayConveyLocation/AddTrayConveyLocation.vue b/wcs_web/src/components/page/trayConveyLocation/AddTrayConveyLocation.vue index b00b83d..10a29a1 100644 --- a/wcs_web/src/components/page/trayConveyLocation/AddTrayConveyLocation.vue +++ b/wcs_web/src/components/page/trayConveyLocation/AddTrayConveyLocation.vue @@ -8,6 +8,7 @@ import TrayConveyLocationApi from "@/api/trayConveyLocation.ts"; import type {AppServeResponse} from "@/interface/api/AppServeResponse.ts"; import {AppServeResponseCodeEnum} from "@/constant/enums/AppServeResponseCodeEnum.ts"; import StringUtils from "@/utils/StringUtils.ts"; +import AppPermission from "@/components/manage/AppPermission.vue"; const modelValue = defineModel('modelValue', {required: true, default: false}); const emit = defineEmits(['reLoadingTableData']); @@ -122,7 +123,7 @@ onMounted(() => { diff --git a/wcs_web/src/components/page/trayConveyLocation/TrayConveyLocationDetail.vue b/wcs_web/src/components/page/trayConveyLocation/TrayConveyLocationDetail.vue index 8c36ce1..ddf15eb 100644 --- a/wcs_web/src/components/page/trayConveyLocation/TrayConveyLocationDetail.vue +++ b/wcs_web/src/components/page/trayConveyLocation/TrayConveyLocationDetail.vue @@ -10,6 +10,7 @@ import TrayConveyLocationApi from "@/api/trayConveyLocation.ts"; import type {AppServeResponse} from "@/interface/api/AppServeResponse.ts"; import {AppServeResponseCodeEnum} from "@/constant/enums/AppServeResponseCodeEnum.ts"; import type {AppServeDataResponse} from "@/interface/api/AppServeDataResponse.ts"; +import AppPermission from "@/components/manage/AppPermission.vue"; const modelValue = defineModel('modelValue', {required: true, default: false}); const formData = defineModel('rowData', {required: true, default: false}); @@ -153,7 +154,7 @@ const getConveyPlcStatus = () => { @@ -164,8 +165,8 @@ const getConveyPlcStatus = () => { diff --git a/wcs_web/src/components/page/user/UserDetailComponent.vue b/wcs_web/src/components/page/user/UserDetailComponent.vue index 40bf298..4041190 100644 --- a/wcs_web/src/components/page/user/UserDetailComponent.vue +++ b/wcs_web/src/components/page/user/UserDetailComponent.vue @@ -13,6 +13,7 @@ import type {AppServeResponse} from "@/interface/api/AppServeResponse.ts"; import StringUtils from "@/utils/StringUtils.ts"; import type {IAppTableUserGroupVo} from "@/model/table/IAppTableUserGroupVo.ts"; import UserGroupApi from "@/api/userGroup.ts"; +import AppPermission from "@/components/manage/AppPermission.vue"; const userTagStyleFormatter = new UserTagStyleFormatter(); // 表数据格式化 const newUserInfo = ref({}); // 用户的需要修改的新信息 @@ -127,9 +128,11 @@ const loadUserGroup = () => { {{userTagStyleFormatter.userOnlineTagStyleFormatter(formData.online).label}} - - 强制下线 - + + + 强制下线 + + @@ -192,9 +195,8 @@ const loadUserGroup = () => { diff --git a/wcs_web/src/components/page/userGroup/AddUserGroupComponent.vue b/wcs_web/src/components/page/userGroup/AddUserGroupComponent.vue index 433d5f8..4f3a114 100644 --- a/wcs_web/src/components/page/userGroup/AddUserGroupComponent.vue +++ b/wcs_web/src/components/page/userGroup/AddUserGroupComponent.vue @@ -9,6 +9,7 @@ import MessageUtils from "@/utils/MessageUtils.ts"; import UserGroupApi from "@/api/userGroup.ts"; import {AppServeResponseCodeEnum} from "@/constant/enums/AppServeResponseCodeEnum.ts"; import type {AppServeResponse} from "@/interface/api/AppServeResponse.ts"; +import AppPermission from "@/components/manage/AppPermission.vue"; const modelValue = defineModel('modelValue', {required: true, default: false}); const emit = defineEmits(['reLoadingTableData']); @@ -73,7 +74,7 @@ const addUserGroup = () => { diff --git a/wcs_web/src/components/page/userGroup/EditUserGroupComponent.vue b/wcs_web/src/components/page/userGroup/EditUserGroupComponent.vue index 48883b8..83e6424 100644 --- a/wcs_web/src/components/page/userGroup/EditUserGroupComponent.vue +++ b/wcs_web/src/components/page/userGroup/EditUserGroupComponent.vue @@ -7,6 +7,7 @@ import UserGroupApi from "@/api/userGroup.ts"; import MessageUtils from "@/utils/MessageUtils.ts"; import type {AppServeResponse} from "@/interface/api/AppServeResponse.ts"; import {AppServeResponseCodeEnum} from "@/constant/enums/AppServeResponseCodeEnum.ts"; +import AppPermission from "@/components/manage/AppPermission.vue"; const modelValue = defineModel('modelValue', {required: true, default: false}); const emit = defineEmits(['reLoadingTableData']); @@ -65,7 +66,7 @@ const save = () => { diff --git a/wcs_web/src/views/tabs/StackerLocationManage.vue b/wcs_web/src/views/tabs/StackerLocationManage.vue index 56809b0..6700b48 100644 --- a/wcs_web/src/views/tabs/StackerLocationManage.vue +++ b/wcs_web/src/views/tabs/StackerLocationManage.vue @@ -15,7 +15,10 @@ import StackerLocationStatusFormatter from "@/plugin/formatter/StackerLocationSt import AddStackerLocationComponent from "@/components/page/stackerLocation/AddStackerLocationComponent.vue"; import StackerLocationDetailComponent from "@/components/page/stackerLocation/StackerLocationDetailComponent.vue"; import StackerLocationMap from "@/components/page/stackerLocation/StackerLocationMap.vue"; +import {menuStore} from "@/stores/menu.ts"; +import AppPermission from "@/components/manage/AppPermission.vue"; +const menuStoreInstance = menuStore(); const locationSearch = ref({}); // 查询参数 const userStoreInstance = userStore(); // const tableData = ref([]); // 表格数据 @@ -34,6 +37,9 @@ onMounted(() => { // 查询 const query = () => { + if(!menuStoreInstance.checkOperationPermission('stackerLocationManage:queryTable')) { + return; + } const loadingInstance = MessageUtils.loading(); StackerLocationApi.queryStackerLocation(locationSearch.value, pageSize.value, pageIndex.value).then(res => { const responseString = JSON.stringify(res.data); @@ -128,11 +134,11 @@ const handleMap = () => { - 查询/刷新 + 查询/刷新 重置查询参数 - 添加库位 - 导出数据 - 点位图 + 添加库位 + 导出数据 + 点位图 diff --git a/wcs_web/src/views/tabs/StackerManage.vue b/wcs_web/src/views/tabs/StackerManage.vue index 452efa5..b4cf17d 100644 --- a/wcs_web/src/views/tabs/StackerManage.vue +++ b/wcs_web/src/views/tabs/StackerManage.vue @@ -13,8 +13,11 @@ import StackerDetailComponent from "@/components/page/stacker/StackerDetailCompo import StackerStandComponent from "@/components/page/stacker/StackerStandComponent.vue"; import {useI18n} from "vue-i18n"; import StackerRunningInfo from "@/components/page/stacker/StackerRunningInfo.vue"; +import {menuStore} from "@/stores/menu.ts"; +import AppPermission from "@/components/manage/AppPermission.vue"; const { t } = useI18n(); +const menuStoreInstance = menuStore(); const trueFalseTagStyleFormatter = new TrueFalseTagStyleFormatter(); // 是否枚举格式化 const stakerNameSearch = ref(""); // 堆垛机名称 const tableData = ref([]); // 表格数据 @@ -31,6 +34,9 @@ onMounted(() => { // 查询 const query = () => { + if(!menuStoreInstance.checkOperationPermission('stackerManage:queryStacker')) { + return; + } const loadingInstance = MessageUtils.loading(); StackerApi.queryStackerInfo(stakerNameSearch.value).then((res) => { const responseString = JSON.stringify(res.data); @@ -115,10 +121,10 @@ const standEdit = (index: number, row: any) => { - {{ t('baseButton.queryOrReflush') }} + {{ t('baseButton.queryOrReflush') }} {{ t('baseButton.resetInput') }} - {{ t('tabPage.stackerManage.addStacker') }} - {{t('tabPage.stackerManage.stackerRunningInfo')}} + {{ t('tabPage.stackerManage.addStacker') }} + {{t('tabPage.stackerManage.stackerRunningInfo')}} @@ -162,7 +168,7 @@ const standEdit = (index: number, row: any) => { diff --git a/wcs_web/src/views/tabs/StockComposeTask.vue b/wcs_web/src/views/tabs/StockComposeTask.vue index ba52ef0..6065c5a 100644 --- a/wcs_web/src/views/tabs/StockComposeTask.vue +++ b/wcs_web/src/views/tabs/StockComposeTask.vue @@ -15,7 +15,10 @@ import StockComposeStepStatusFormatter from "@/plugin/formatter/StockComposeStep import AddStockComposeTaskComponent from "@/components/page/stockComposeTask/AddStockComposeTaskComponent.vue"; import StockComposeTaskDetailComponent from "@/components/page/stockComposeTask/StockComposeTaskDetailComponent.vue"; import TrueFalseTagStyleFormatter from "@/plugin/formatter/TrueFalseTagStyleFormatter.ts"; +import {menuStore} from "@/stores/menu.ts"; +import AppPermission from "@/components/manage/AppPermission.vue"; +const menuStoreInstance = menuStore(); const querySearch = ref({}); // 查询条件 const stockComposeTaskStatusFormatter = new StockComposeTaskStatusFormatter(); const stockComposeTaskTypeFormatter = new StockComposeTaskTypeFormatter(); @@ -35,6 +38,9 @@ onMounted(() => { // 查询数据 const query = () => { + if(!menuStoreInstance.checkOperationPermission('stockComposeTask:query')) { + return; + } const loadingInstance = MessageUtils.loading(); StockComposeTaskApi.query(querySearch.value, pageSize.value, pageIndex.value).then((res) => { const responseString = JSON.stringify(res.data); @@ -166,10 +172,10 @@ const downLoad = () => { - 查询/刷新 + 查询/刷新 重置查询参数 - 新建任务 - 导出数据 + 新建任务 + 导出数据 diff --git a/wcs_web/src/views/tabs/StockComposeTaskBak.vue b/wcs_web/src/views/tabs/StockComposeTaskBak.vue index c52b290..e063322 100644 --- a/wcs_web/src/views/tabs/StockComposeTaskBak.vue +++ b/wcs_web/src/views/tabs/StockComposeTaskBak.vue @@ -14,6 +14,7 @@ import type {PageDataResponse} from "@/interface/api/PageDataResponse.ts"; import StockComposeStepStatusFormatter from "@/plugin/formatter/StockComposeStepStatusFormatter.ts"; import TrueFalseTagStyleFormatter from "@/plugin/formatter/TrueFalseTagStyleFormatter.ts"; import StockComposeTaskBakDetailComponent from "@/components/page/stockComposeTask/StockComposeTaskBakDetailComponent.vue"; +import AppPermission from "@/components/manage/AppPermission.vue"; const querySearch = ref({}); // 查询条件 const stockComposeTaskStatusFormatter = new StockComposeTaskStatusFormatter(); @@ -157,9 +158,9 @@ const downLoad = () => { - 查询/刷新 + 查询/刷新 重置查询参数 - 导出数据 + 导出数据 diff --git a/wcs_web/src/views/tabs/StockScanManage.vue b/wcs_web/src/views/tabs/StockScanManage.vue index d9d5118..1d940e7 100644 --- a/wcs_web/src/views/tabs/StockScanManage.vue +++ b/wcs_web/src/views/tabs/StockScanManage.vue @@ -1,8 +1,6 @@