diff --git a/wcs/src/main/java/org/wcs/config/SaTokenConfigure.java b/wcs/src/main/java/org/wcs/config/SaTokenConfigure.java index 0405521..fd298a7 100644 --- a/wcs/src/main/java/org/wcs/config/SaTokenConfigure.java +++ b/wcs/src/main/java/org/wcs/config/SaTokenConfigure.java @@ -12,6 +12,7 @@ import org.springframework.context.annotation.Bean; import org.springframework.context.annotation.Configuration; import org.springframework.web.servlet.config.annotation.InterceptorRegistry; import org.springframework.web.servlet.config.annotation.WebMvcConfigurer; +import org.wcs.business.saToken.StpInterfaceImpl; @Configuration public class SaTokenConfigure implements WebMvcConfigurer { @@ -19,9 +20,10 @@ public class SaTokenConfigure implements WebMvcConfigurer { @Override public void addInterceptors(InterceptorRegistry registry) { // 注册 Sa-Token 拦截器,校验规则为 StpUtil.checkLogin() 登录校验。 - registry.addInterceptor(new SaInterceptor(handle -> StpUtil.checkLogin())) - .addPathPatterns("/**") - .excludePathPatterns("/**/user/login", "/**/app/system/**", "/api/pub/**"); + registry.addInterceptor(new SaInterceptor(handle -> { + StpUtil.checkLogin(); + })).addPathPatterns("/**").excludePathPatterns("/**/user/login", "/**/app/system/**", "/api/pub/**"); + registry.addInterceptor(new SaInterceptor()).addPathPatterns("/**").excludePathPatterns("/**/user/login", "/**/app/system/**", "/api/pub/**"); } /** diff --git a/wcs/src/main/java/org/wcs/serve/controller/app/ConveyStandController.java b/wcs/src/main/java/org/wcs/serve/controller/app/ConveyStandController.java index bd78b44..9cd2e5a 100644 --- a/wcs/src/main/java/org/wcs/serve/controller/app/ConveyStandController.java +++ b/wcs/src/main/java/org/wcs/serve/controller/app/ConveyStandController.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 ConveyStandController { * @param pageIndex 页码 * @return 站台列表 */ + @SaCheckPermission("conveyPickStand:query") @PostMapping("queryPickStand") public AppServeDataResponse> queryPickStand(@RequestBody QueryPickStandReq request, @RequestParam("pageSize") Integer pageSize, @RequestParam("pageIndex") Integer pageIndex) { return conveyStandService.queryPickStand(request, pageSize, pageIndex); @@ -41,6 +43,7 @@ public class ConveyStandController { * @param request 添加参数 * @return 结果 */ + @SaCheckPermission("conveyPickStand:add") @PostMapping("addConveyPickStand") public AppServeResponse addConveyPickStand(@RequestBody @Validated AddConveyPickStandReq request) { return conveyStandService.addConveyPickStand(request); @@ -51,6 +54,7 @@ public class ConveyStandController { * @param standId 站台ID * @return 删除结果 */ + @SaCheckPermission("conveyPickStand:delete") @DeleteMapping("deleteConveyPickStand") public AppServeResponse deleteConveyPickStand(@RequestParam("standId") @NotBlank(message = "站台ID不能为空") String standId) { return conveyStandService.deleteConveyPickStand(standId); @@ -61,6 +65,7 @@ public class ConveyStandController { * @param request 修改参数 * @return 修改结果 */ + @SaCheckPermission("conveyPickStand:edit") @PostMapping("updateConveyPickStand") public AppServeResponse updateConveyPickStand(@RequestBody @Validated UpdateConveyPickStandReq request) { return conveyStandService.updateConveyPickStand(request); @@ -73,6 +78,7 @@ public class ConveyStandController { * @param pageIndex 页码 * @return 站台列表 */ + @SaCheckPermission("conveyCheckStand:query") @PostMapping("queryCheckStand") public AppServeDataResponse> queryCheckStand(@RequestBody QueryCheckStandReq request, @RequestParam("pageSize") Integer pageSize, @RequestParam("pageIndex") Integer pageIndex) { return conveyStandService.queryCheckStand(request, pageSize, pageIndex); @@ -84,6 +90,7 @@ public class ConveyStandController { * @param request 添加参数 * @return 添加结果 */ + @SaCheckPermission("conveyCheckStand:add") @PostMapping("addConveyCheckStand") public AppServeResponse addConveyCheckStand(@RequestBody @Validated AddConveyCheckStandReq request) { return conveyStandService.addConveyCheckStand(request); @@ -94,6 +101,7 @@ public class ConveyStandController { * @param standId 站台ID * @return 删除结果 */ + @SaCheckPermission("conveyCheckStand:delete") @DeleteMapping("deleteConveyCheckStand") public AppServeResponse deleteConveyCheckStand(@RequestParam("standId") @NotBlank(message = "站台ID不能为空") String standId) { return conveyStandService.deleteConveyCheckStand(standId); @@ -104,6 +112,7 @@ public class ConveyStandController { * @param request 修改参数 * @return 修改结果 */ + @SaCheckPermission("conveyCheckStand:edit") @PostMapping("updateConveyCheckStand") public AppServeResponse updateConveyCheckStand(@RequestBody @Validated UpdateConveyCheckStandReq request) { return conveyStandService.updateConveyCheckStand(request); @@ -114,6 +123,7 @@ public class ConveyStandController { * @param request 添加参数 * @return 添加结果 */ + @SaCheckPermission("conveyDeliverStand:query") @PostMapping("queryDeliverStand") public AppServeDataResponse> queryDeliverStand(@RequestBody QueryDeliverStandReq request, @RequestParam("pageSize") Integer pageSize, @RequestParam("pageIndex") Integer pageIndex) { return conveyStandService.queryDeliverStand(request, pageSize, pageIndex); @@ -124,6 +134,7 @@ public class ConveyStandController { * @param request 添加参数 * @return 添加结果 */ + @SaCheckPermission("conveyDeliverStand:add") @PostMapping("addConveyDeliverStand") public AppServeResponse addConveyDeliverStand(@RequestBody @Validated AddConveyDeliverStandReq request) { return conveyStandService.addConveyDeliverStand(request); @@ -134,6 +145,7 @@ public class ConveyStandController { * @param standId 站台ID * @return 删除结果 */ + @SaCheckPermission("conveyDeliverStand:delete") @DeleteMapping("deleteConveyDeliverStand") public AppServeResponse deleteConveyDeliverStand(@RequestParam("standId") @NotBlank(message = "站台ID不能为空") String standId) { return conveyStandService.deleteConveyDeliverStand(standId); @@ -144,6 +156,7 @@ public class ConveyStandController { * @param request 添加参数 * @return 添加结果 */ + @SaCheckPermission("conveyDeliverStand:edit") @PostMapping("updateConveyDeliverStand") public AppServeResponse updateConveyDeliverStand(@RequestBody @Validated UpdateConveyDeliverStandReq request) { return conveyStandService.updateConveyDeliverStand(request); diff --git a/wcs/src/main/java/org/wcs/serve/controller/app/ConveyTaskController.java b/wcs/src/main/java/org/wcs/serve/controller/app/ConveyTaskController.java index 216f68b..c955c3d 100644 --- a/wcs/src/main/java/org/wcs/serve/controller/app/ConveyTaskController.java +++ b/wcs/src/main/java/org/wcs/serve/controller/app/ConveyTaskController.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 jakarta.validation.constraints.NotNull; @@ -33,6 +34,7 @@ public class ConveyTaskController { * @param pageIndex 页码 * @return 结果 */ + @SaCheckPermission("conveyTask:query") @PostMapping("queryConveyTask") public AppServeDataResponse> queryConveyTask(@RequestBody QueryConveyTaskReq request, @RequestParam("pageSize") Integer pageSize, @RequestParam("pageIndex") Integer pageIndex) { return conveyTaskService.queryConveyTask(request, pageSize, pageIndex); @@ -45,6 +47,7 @@ public class ConveyTaskController { * @param pageIndex 页码 * @return 箱式线任务列表 */ + @SaCheckPermission("conveyTaskBak:query") @PostMapping("queryConveyTaskBak") public AppServeDataResponse> queryConveyTaskBak(@RequestBody QueryConveyTaskReq request, @RequestParam("pageSize") Integer pageSize, @RequestParam("pageIndex") Integer pageIndex) { return conveyTaskService.queryConveyTaskBak(request, pageSize, pageIndex); @@ -55,6 +58,7 @@ public class ConveyTaskController { * @param request 新增参数 * @return 结果 */ + @SaCheckPermission("conveyTask:add") @PostMapping("addConveyTask") public AppServeResponse addConveyTask(@RequestBody @Validated AddConveyTaskReq request) { return conveyTaskService.addConveyTask(request); @@ -66,6 +70,7 @@ public class ConveyTaskController { * @param status 状态 * @return 结果 */ + @SaCheckPermission("conveyTask:edit") @PutMapping("updateConveyTaskStatus") public AppServeResponse updateConveyTaskStatus(@RequestParam("taskId") @NotBlank(message = "任务ID不能为空") String taskId, @RequestParam("taskStatus") @NotNull(message = "状态不能为空") Integer status) { return conveyTaskService.updateConveyTaskStatus(taskId, status); @@ -77,6 +82,7 @@ public class ConveyTaskController { * @param arriveLocation 到达位置 * @return 结果 */ + @SaCheckPermission("conveyTask:edit") @PutMapping("completeConveyTask") public AppServeResponse completeConveyTask(@RequestParam("taskId") @NotBlank(message = "任务ID不能为空") String taskId, @RequestParam("arriveLocation") @NotNull(message = "到达位置不能为空") String arriveLocation) { return conveyTaskService.completeConveyTask(taskId, arriveLocation); @@ -87,6 +93,7 @@ public class ConveyTaskController { * @param taskId 箱式线任务ID * @return 取消结果 */ + @SaCheckPermission("conveyTask:edit") @DeleteMapping("cancelConveyTask") public AppServeResponse cancelConveyTask(@RequestParam("taskId") @NotBlank(message = "箱式线任务ID不能为空") String taskId) { return conveyTaskService.cancelConveyTask(taskId); @@ -97,6 +104,7 @@ public class ConveyTaskController { * @param request 汇报参数 * @return 汇报结果 */ + @SaCheckPermission("conveyTask:edit") @PostMapping("reporterConveyTaskComplete") public AppServeResponse reporterConveyTaskComplete(@RequestBody @Validated ReporterConveyTaskStatusReq request) { return conveyTaskService.reporterConveyTaskComplete(request); @@ -107,6 +115,7 @@ public class ConveyTaskController { * @param request 汇报参数 * @return 汇报结果 */ + @SaCheckPermission("conveyTask:edit") @PostMapping("reporterConveyTaskCancel") public AppServeResponse reporterConveyTaskCancel(@RequestBody @Validated ReporterConveyTaskStatusReq request) { return conveyTaskService.reporterConveyTaskCancel(request); @@ -117,6 +126,7 @@ public class ConveyTaskController { * @param request 汇报参数 * @return 汇报结果 */ + @SaCheckPermission("conveyTaskBak:edit") @PostMapping("reporterConveyTaskBakComplete") public AppServeResponse reporterConveyTaskBakComplete(@RequestBody @Validated ReporterConveyTaskStatusReq request) { return conveyTaskService.reporterConveyTaskBakComplete(request); @@ -127,6 +137,7 @@ public class ConveyTaskController { * @param request 汇报参数 * @return 汇报结果 */ + @SaCheckPermission("conveyTaskBak:edit") @PostMapping("reporterConveyTaskBakCancel") public AppServeResponse reporterConveyTaskBakCancel(@RequestBody @Validated ReporterConveyTaskStatusReq request) { return conveyTaskService.reporterConveyTaskBakCancel(request); @@ -137,6 +148,7 @@ public class ConveyTaskController { * @param response 响应 * @param request 查询参数 */ + @SaCheckPermission("conveyTaskBak:export") @PostMapping("exportConveyTaskBak") public void exportConveyTaskBak(HttpServletResponse response, @RequestBody @Validated QueryConveyTaskReq request) { conveyTaskService.exportConveyTaskBak(response, request); diff --git a/wcs/src/main/java/org/wcs/serve/controller/app/EtagBaseController.java b/wcs/src/main/java/org/wcs/serve/controller/app/EtagBaseController.java index 56826b9..2604276 100644 --- a/wcs/src/main/java/org/wcs/serve/controller/app/EtagBaseController.java +++ b/wcs/src/main/java/org/wcs/serve/controller/app/EtagBaseController.java @@ -1,5 +1,6 @@ package org.wcs.serve.controller.app; +import cn.dev33.satoken.annotation.SaCheckPermission; import jakarta.validation.constraints.NotNull; import lombok.RequiredArgsConstructor; import org.springframework.validation.annotation.Validated; @@ -34,6 +35,7 @@ public class EtagBaseController { * @param pageSize 页大小 * @return 响应 */ + @SaCheckPermission("etagController:query") @PostMapping("queryEtagController") public AppServeDataResponse> queryEtagController(@RequestBody EtagControllerQueryReq request, @RequestParam("pageIndex") @NotNull(message = "页码不能为空") Integer pageIndex, @RequestParam("pageSize") @NotNull(message = "页大小不能为空") Integer pageSize) { return etagBaseService.queryEtagController(request, pageIndex, pageSize); @@ -44,6 +46,7 @@ public class EtagBaseController { * @param request 新增参数 * @return 响应 */ + @SaCheckPermission("etagController:add") @PostMapping("addEtagController") public AppServeResponse addEtagController(@RequestBody @Validated AddEtagControllerReq request) { return etagBaseService.addEtagController(request); @@ -54,6 +57,7 @@ public class EtagBaseController { * @param request 修改参数 * @return 响应 */ + @SaCheckPermission("etagController:edit") @PutMapping("updateEtagController") public AppServeResponse updateEtagController(@RequestBody @Validated UpdateEtagControllerReq request) { return etagBaseService.updateEtagController(request); @@ -64,6 +68,7 @@ public class EtagBaseController { * @param controllerId 控制器ID * @return 响应 */ + @SaCheckPermission("etagController:delete") @DeleteMapping("deleteEtagController") public AppServeResponse deleteEtagController(@RequestParam @NotNull(message = "控制器ID不能为空") Integer controllerId) { return etagBaseService.deleteEtagController(controllerId); @@ -78,6 +83,7 @@ public class EtagBaseController { * @param pageSize 页大小 * @return 响应 */ + @SaCheckPermission("etagTag:query") @PostMapping("queryEtagTagInfo") public AppServeDataResponse> queryEtagTagInfo(@RequestBody EtagTagInfoQueryReq request, @RequestParam("pageIndex") @NotNull(message = "页码不能为空") Integer pageIndex, @RequestParam("pageSize") @NotNull(message = "页大小不能为空") Integer pageSize) { return etagBaseService.queryEtagTagInfo(request, pageIndex, pageSize); @@ -88,6 +94,7 @@ public class EtagBaseController { * @param request 新增参数 * @return 响应 */ + @SaCheckPermission("etagTag:add") @PostMapping("addEtagTagInfo") public AppServeResponse addEtagTagInfo(@RequestBody @Validated AddEtagTagInfoReq request) { return etagBaseService.addEtagTagInfo(request); @@ -98,6 +105,7 @@ public class EtagBaseController { * @param request 修改参数 * @return 响应 */ + @SaCheckPermission("etagTag:edit") @PutMapping("updateEtagTagInfo") public AppServeResponse updateEtagTagInfo(@RequestBody @Validated UpdateEtagTagInfoReq request) { return etagBaseService.updateEtagTagInfo(request); @@ -108,6 +116,7 @@ public class EtagBaseController { * @param tagName 标签名称 * @return 响应 */ + @SaCheckPermission("etagTag:delete") @DeleteMapping("deleteEtagTagInfo") public AppServeResponse deleteEtagTagInfo(@RequestParam @NotNull(message = "标签名称不能为空") String tagName) { return etagBaseService.deleteEtagTagInfo(tagName); @@ -122,6 +131,7 @@ public class EtagBaseController { * @param pageSize 页大小 * @return 响应 */ + @SaCheckPermission("etagLocation:query") @PostMapping("queryEtagLocation") public AppServeDataResponse> queryEtagLocation(@RequestBody EtagLocationQueryReq request, @RequestParam("pageIndex") @NotNull(message = "页码不能为空") Integer pageIndex, @RequestParam("pageSize") @NotNull(message = "页大小不能为空") Integer pageSize) { return etagBaseService.queryEtagLocation(request, pageIndex, pageSize); @@ -132,6 +142,7 @@ public class EtagBaseController { * @param request 新增参数 * @return 响应 */ + @SaCheckPermission("etagLocation:add") @PostMapping("addEtagLocation") public AppServeResponse addEtagLocation(@RequestBody @Validated AddEtagLocationReq request) { return etagBaseService.addEtagLocation(request); @@ -142,6 +153,7 @@ public class EtagBaseController { * @param request 修改参数 * @return 响应 */ + @SaCheckPermission("etagLocation:edit") @PutMapping("updateEtagLocation") public AppServeResponse updateEtagLocation(@RequestBody @Validated UpdateEtagLocationReq request) { return etagBaseService.updateEtagLocation(request); @@ -152,6 +164,7 @@ public class EtagBaseController { * @param recordId 记录号 * @return 响应 */ + @SaCheckPermission("etagLocation:delete") @DeleteMapping("deleteEtagLocation/{recordId}") public AppServeResponse deleteEtagLocation(@PathVariable @NotNull(message = "记录号不能为空") String recordId) { return etagBaseService.deleteEtagLocation(recordId); diff --git a/wcs/src/main/java/org/wcs/serve/controller/app/EtagTaskController.java b/wcs/src/main/java/org/wcs/serve/controller/app/EtagTaskController.java index d684440..5d504d1 100644 --- a/wcs/src/main/java/org/wcs/serve/controller/app/EtagTaskController.java +++ b/wcs/src/main/java/org/wcs/serve/controller/app/EtagTaskController.java @@ -1,5 +1,7 @@ package org.wcs.serve.controller.app; +import cn.dev33.satoken.annotation.SaCheckPermission; +import cn.dev33.satoken.annotation.SaMode; import jakarta.validation.constraints.Min; import jakarta.validation.constraints.NotBlank; import lombok.RequiredArgsConstructor; @@ -35,6 +37,7 @@ public class EtagTaskController { * @param pageSize 页大小 * @return 响应 */ + @SaCheckPermission("etagTask:query") @PostMapping("/queryEtagTask") public AppServeDataResponse> queryEtagTask(@RequestBody EtagTaskQueryReq request, @RequestParam("pageIndex") @NotNull(message = "页码不能为空") Integer pageIndex, @RequestParam("pageSize") @NotNull(message = "页大小不能为空") Integer pageSize) { return etagTaskService.queryEtagTask(request, pageIndex, pageSize); @@ -46,6 +49,7 @@ public class EtagTaskController { * @param request 新增参数 * @return 响应 */ + @SaCheckPermission("etagTask:add") @PostMapping("/addEtagTask") public AppServeResponse addEtagTask(@RequestBody @Validated AddEtagTaskReq request) { return etagTaskService.addEtagTask(request); @@ -56,6 +60,7 @@ public class EtagTaskController { * @param request 修改参数 * @return 响应 */ + @SaCheckPermission("etagTask:edit") @PostMapping("/updateEtagTask") public AppServeResponse updateEtagTask(@RequestBody @Validated UpdateEtagTaskReq request) { return etagTaskService.updateEtagTask(request); @@ -68,6 +73,7 @@ public class EtagTaskController { * @param pageSize 页大小 * @return 响应 */ + @SaCheckPermission("etagTaskBak:query") @PostMapping("/queryEtagTaskBak") public AppServeDataResponse> queryEtagTaskBak(@RequestBody EtagTaskQueryReq request, @RequestParam("pageIndex") @NotNull(message = "页码不能为空") Integer pageIndex, @RequestParam("pageSize") @NotNull(message = "页大小不能为空") Integer pageSize) { return etagTaskService.queryEtagTaskBak(request, pageIndex, pageSize); @@ -80,6 +86,7 @@ public class EtagTaskController { * @param confirmNum 确认数量 * @return 响应 */ + @SaCheckPermission(value = {"etagTask:upload", "etagTaskBak:upload"}, mode = SaMode.OR) @PutMapping("/uploadTaskConfirmNum") public AppServeResponse uploadTaskConfirmNum(@RequestParam("taskId") @NotBlank(message = "任务ID不允许未为空") String taskId, @RequestParam("confirmNum") @NotNull(message = "确认数不能为空") @Min(value = 0, message = "确认数不能小于0") Integer confirmNum) { return etagTaskService.uploadTaskConfirmNum(taskId, confirmNum); diff --git a/wcs/src/main/resources/application-dev.yml b/wcs/src/main/resources/application-dev.yml index 424e4a3..3924f32 100644 --- a/wcs/src/main/resources/application-dev.yml +++ b/wcs/src/main/resources/application-dev.yml @@ -1,10 +1,10 @@ spring: # 开发环境数据库 datasource: - url: jdbc:mysql://127.0.0.1:3306/wcs?characterEncoding=utf8&useSSL=false&useUnicode=true&serverTimezone=Asia/Shanghai&allowPublicKeyRetrieval=true + url: jdbc:mysql://127.0.0.1:3306/wcs_java_demo?characterEncoding=utf8&useSSL=false&useUnicode=true&serverTimezone=Asia/Shanghai&allowPublicKeyRetrieval=true # jdbc.url=jdbc:mysql://localhost:3306/imoocdemo?useUnicode=true&characterEncoding=utf8&useSSL=false&&serverTimezone=CST - username: root - password: Root123456 + username: developer + password: developer driver-class-name: com.mysql.cj.jdbc.Driver # 开发环境Redis配置 data: diff --git a/wcs_web/src/api/axios.ts b/wcs_web/src/api/axios.ts index d9fc548..d911ee3 100644 --- a/wcs_web/src/api/axios.ts +++ b/wcs_web/src/api/axios.ts @@ -15,7 +15,7 @@ import MessageUtils from "@/utils/MessageUtils.ts"; // } const axiosInstance = axios.create({ - baseURL: 'http://localhost:9970/api/wcsdev', + baseURL: 'http://112.4.208.194:3002/wcsDemoServe/api/wcsdev', timeout: 30000, headers: { "Content-Type": "application/json" diff --git a/wcs_web/src/components/manage/AppPermission.vue b/wcs_web/src/components/manage/AppPermission.vue index 9167598..6b5f90a 100644 --- a/wcs_web/src/components/manage/AppPermission.vue +++ b/wcs_web/src/components/manage/AppPermission.vue @@ -1,11 +1,25 @@ + + +