diff --git a/wcs/src/main/java/org/wcs/serve/controller/app/LedController.java b/wcs/src/main/java/org/wcs/serve/controller/app/LedController.java index 4be1253..6d3bd98 100644 --- a/wcs/src/main/java/org/wcs/serve/controller/app/LedController.java +++ b/wcs/src/main/java/org/wcs/serve/controller/app/LedController.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 LedController { * @param queryLedReq 查询LED屏基础资料请求 * @return 查询结果 */ + @SaCheckPermission("ledManage:query") @PostMapping("/queryLed") public AppServeDataResponse> queryLed(@RequestBody QueryLedReq queryLedReq) { return ledService.queryLed(queryLedReq); @@ -41,6 +43,7 @@ public class LedController { * @param addBaseLedReq 新增LED屏基础资料请求 * @return 新增结果 */ + @SaCheckPermission("ledManage:add") @PostMapping("/addBaseLed") public AppServeResponse addBaseLed(@RequestBody @Validated AddBaseLedReq addBaseLedReq) { return ledService.addBaseLed(addBaseLedReq); @@ -51,6 +54,7 @@ public class LedController { * @param updateBaseLedReq 修改LED屏基础资料请求 * @return 修改结果 */ + @SaCheckPermission("ledManage:edit") @PostMapping("/updateBaseLed") public AppServeResponse updateBaseLed(@RequestBody @Validated UpdateBaseLedReq updateBaseLedReq) { return ledService.updateBaseLed(updateBaseLedReq); @@ -61,8 +65,9 @@ public class LedController { * @param id LED屏基础资料ID * @return 删除结果 */ + @SaCheckPermission("ledManage:delete") @DeleteMapping("/deleteBaseLed/{id}") - public AppServeResponse deleteBaseLed(@PathVariable("id") @NotBlank(message = "id不能为空") String id) { + public AppServeResponse deleteBaseLed(@PathVariable @NotBlank(message = "id不能为空") String id) { return ledService.deleteBaseLed(id); } diff --git a/wcs/src/main/java/org/wcs/serve/controller/app/MenuController.java b/wcs/src/main/java/org/wcs/serve/controller/app/MenuController.java index 11653a2..bbb762a 100644 --- a/wcs/src/main/java/org/wcs/serve/controller/app/MenuController.java +++ b/wcs/src/main/java/org/wcs/serve/controller/app/MenuController.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; @@ -32,6 +33,7 @@ public class MenuController { * @param queryMenuReq 查询菜单请求 * @return 查询结果 */ + @SaCheckPermission("menuManage:query") @PostMapping("/queryMenu") public AppServeDataResponse> queryMenu(@RequestBody QueryMenuReq queryMenuReq) { return menuService.queryMenu(queryMenuReq); @@ -42,6 +44,7 @@ public class MenuController { * @param addMenuReq 添加的数据 * @return 结果 */ + @SaCheckPermission("menuManage:add") @PostMapping("/addMenu") public AppServeResponse addMenu(@RequestBody @Validated AddMenuReq addMenuReq) { return menuService.addMenu(addMenuReq); @@ -52,6 +55,7 @@ public class MenuController { * @param menuId 菜单ID * @return 结果 */ + @SaCheckPermission("menuManage:delete") @DeleteMapping("/deleteMenu/{menuId}") public AppServeResponse deleteMenu(@PathVariable @NotBlank(message = "菜单ID不能为空") String menuId) { return menuService.deleteMenu(menuId); @@ -62,6 +66,7 @@ public class MenuController { * @param updateMenuReq 更新的数据 * @return 结果 */ + @SaCheckPermission("menuManage:edit") @PostMapping("/updateMenu") public AppServeResponse updateMenu(@RequestBody @Validated UpdateMenuReq updateMenuReq) { return menuService.updateMenu(updateMenuReq); @@ -72,6 +77,7 @@ public class MenuController { * @param menuId 菜单ID * @return 菜单权限列表 */ + @SaCheckPermission("menuManage:permission") @GetMapping("/queryMenuPermission/{menuId}") public AppServeDataResponse> queryMenuPermission(@PathVariable String menuId) { return menuService.queryMenuPermission(menuId); @@ -82,6 +88,7 @@ public class MenuController { * @param request 添加的数据 * @return 添加结果 */ + @SaCheckPermission("menuManage:permission") @PostMapping("/addBaseMenuPermission") public AppServeResponse addBaseMenuPermission(@RequestBody @Validated AddBaseMenuPermission request) { return menuService.addBaseMenuPermission(request); @@ -92,6 +99,7 @@ public class MenuController { * @param permissionId 菜单权限ID * @return 删除结果 */ + @SaCheckPermission("menuManage:permission") @DeleteMapping("/deleteBaseMenuPermission/{permissionId}") public AppServeResponse deleteBaseMenuPermission(@PathVariable @NotBlank(message = "权限ID不能为空") String permissionId) { return menuService.deleteBaseMenuPermission(permissionId); diff --git a/wcs/src/main/java/org/wcs/serve/controller/app/PlcController.java b/wcs/src/main/java/org/wcs/serve/controller/app/PlcController.java index 7cf5430..202ae1c 100644 --- a/wcs/src/main/java/org/wcs/serve/controller/app/PlcController.java +++ b/wcs/src/main/java/org/wcs/serve/controller/app/PlcController.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; @@ -30,6 +31,7 @@ public class PlcController { * @param queryPlcReq 查询 plc 请求 * @return 查询结果 */ + @SaCheckPermission("plcManage:query") @PostMapping("/queryBasePlc") public AppServeDataResponse> queryPlc(@RequestBody QueryBasePlcReq queryPlcReq) { return plcService.queryPlc(queryPlcReq); @@ -40,6 +42,7 @@ public class PlcController { * @param addPlcReq 新增 plc 请求 * @return 新增结果 */ + @SaCheckPermission("plcManage:add") @PostMapping("/addPlc") public AppServeResponse addPlc(@RequestBody @Validated AddPlcReq addPlcReq) { return plcService.addPlc(addPlcReq); @@ -50,6 +53,7 @@ public class PlcController { * @param updatePlcReq 修改 plc 请求 * @return 修改结果 */ + @SaCheckPermission("plcManage:edit") @PostMapping("/updatePlc") public AppServeResponse updatePlc(@RequestBody @Validated UpdatePlcReq updatePlcReq) { return plcService.updatePlc(updatePlcReq); @@ -60,6 +64,7 @@ public class PlcController { * @param plcId plcId * @return 删除结果 */ + @SaCheckPermission("plcManage:delete") @DeleteMapping("/deletePlc/{plcId}") public AppServeResponse deletePlc(@PathVariable @NotNull(message = "plcId不能为空") Integer plcId) { return plcService.deletePlc(plcId); diff --git a/wcs/src/main/java/org/wcs/serve/controller/app/QuartzController.java b/wcs/src/main/java/org/wcs/serve/controller/app/QuartzController.java index 8290f8c..bd91778 100644 --- a/wcs/src/main/java/org/wcs/serve/controller/app/QuartzController.java +++ b/wcs/src/main/java/org/wcs/serve/controller/app/QuartzController.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; @@ -31,6 +32,7 @@ public class QuartzController { * @param quartzReq 查询参数 * @return 结果 */ + @SaCheckPermission("quartzManage:query") @PostMapping("/query") public AppServeDataResponse> query(@RequestBody QuartzReq quartzReq) { return quartzService.query(quartzReq); @@ -41,6 +43,7 @@ public class QuartzController { * @param addQuartzConfigReq 定时任务数据 * @return 添加结果 */ + @SaCheckPermission("quartzManage:add") @PostMapping("/addQuartzConfig") public AppServeResponse addQuartzConfig(@RequestBody @Validated AddQuartzConfigReq addQuartzConfigReq) { return quartzService.addQuartzConfig(addQuartzConfigReq); @@ -51,6 +54,7 @@ public class QuartzController { * @param className 类名 * @return 结果 */ + @SaCheckPermission("quartzManage:delete") @DeleteMapping("/deleteQuartzConfig/{className}") public AppServeResponse deleteQuartzConfig(@PathVariable @NotBlank(message = "类名不能为空") String className) { return quartzService.deleteQuartzConfig(className); @@ -61,6 +65,7 @@ public class QuartzController { * @param className 类名 * @return 结果 */ + @SaCheckPermission("quartzManage:switch") @PutMapping("/stopQuartzJob/{className}") public AppServeResponse stopQuartzJob(@PathVariable @NotBlank(message = "任务名称不能为空") String className) { return quartzService.stopQuartzJob(className); @@ -71,6 +76,7 @@ public class QuartzController { * @param className 类名 * @return 启动结果 */ + @SaCheckPermission("quartzManage:switch") @PutMapping("/startQuartzJob/{className}") public AppServeResponse startQuartzJob(@PathVariable @NotBlank(message = "任务名称不能为空") String className) { return quartzService.startQuartzJob(className); @@ -81,6 +87,7 @@ public class QuartzController { * @param updateQuartzConfigReq 定时任务数据 * @return 更新结果 */ + @SaCheckPermission("quartzManage:edit") @PostMapping("/updateQuartzConfig") public AppServeResponse updateQuartzConfig(@RequestBody @Validated UpdateQuartzConfigReq updateQuartzConfigReq) { return quartzService.updateQuartzConfig(updateQuartzConfigReq); diff --git a/wcs/src/main/java/org/wcs/serve/controller/app/RecordApiController.java b/wcs/src/main/java/org/wcs/serve/controller/app/RecordApiController.java index 2e50751..760d756 100644 --- a/wcs/src/main/java/org/wcs/serve/controller/app/RecordApiController.java +++ b/wcs/src/main/java/org/wcs/serve/controller/app/RecordApiController.java @@ -1,5 +1,6 @@ package org.wcs.serve.controller.app; +import cn.dev33.satoken.annotation.SaCheckPermission; import lombok.RequiredArgsConstructor; import org.springframework.web.bind.annotation.*; import org.wcs.model.dto.serve.recordApi.QueryRecordApiRequestReq; @@ -28,6 +29,7 @@ public class RecordApiController { * @param pageIndex 页码 * @return 查询结果 */ + @SaCheckPermission("recordApiRequest:query") @PostMapping("/queryApiRequestWithPage") public AppServeDataResponse> queryRecordApiRequest(@RequestBody QueryRecordApiRequestReq request, @RequestParam("pageSize") Integer pageSize, @RequestParam("pageIndex") Integer pageIndex) { return recordApiRequestService.queryRecordApiRequest(request, pageSize, pageIndex); @@ -40,6 +42,7 @@ public class RecordApiController { * @param pageIndex 页码 * @return 查询结果 */ + @SaCheckPermission("recordApiResponse:query") @PostMapping("/queryApiResponseWithPage") public AppServeDataResponse> queryRecordApiResponse(@RequestBody QueryRecordApiResponseReq request, @RequestParam("pageSize") Integer pageSize, @RequestParam("pageIndex") Integer pageIndex) { return recordApiRequestService.queryRecordApiResponse(request, pageSize, pageIndex); diff --git a/wcs/src/main/java/org/wcs/serve/controller/app/RecordErrorController.java b/wcs/src/main/java/org/wcs/serve/controller/app/RecordErrorController.java index 68d3e80..5bfe971 100644 --- a/wcs/src/main/java/org/wcs/serve/controller/app/RecordErrorController.java +++ b/wcs/src/main/java/org/wcs/serve/controller/app/RecordErrorController.java @@ -1,5 +1,6 @@ package org.wcs.serve.controller.app; +import cn.dev33.satoken.annotation.SaCheckPermission; import jakarta.servlet.http.HttpServletResponse; import lombok.RequiredArgsConstructor; import org.springframework.web.bind.annotation.*; @@ -27,6 +28,7 @@ public class RecordErrorController { * @param pageIndex 页面序号 * @return 查询结果 */ + @SaCheckPermission("equipmentError:query") @PostMapping("queryEquipmentError") public AppServeDataResponse> queryEquipmentError(@RequestBody QueryEquipmentErrorReq request, Integer pageSize, Integer pageIndex) { return recordErrorService.queryEquipmentError(request, pageSize, pageIndex); @@ -37,6 +39,7 @@ public class RecordErrorController { * @param response 响应 * @param request 查询参数 */ + @SaCheckPermission("equipmentError:export") @PostMapping("exportEquipmentError") public void exportEquipmentError(HttpServletResponse response, @RequestBody QueryEquipmentErrorReq request) { recordErrorService.exportEquipmentError(response, request); diff --git a/wcs/src/main/java/org/wcs/serve/controller/app/RecordScanController.java b/wcs/src/main/java/org/wcs/serve/controller/app/RecordScanController.java index cbf9d53..3dbea0a 100644 --- a/wcs/src/main/java/org/wcs/serve/controller/app/RecordScanController.java +++ b/wcs/src/main/java/org/wcs/serve/controller/app/RecordScanController.java @@ -1,5 +1,6 @@ package org.wcs.serve.controller.app; +import cn.dev33.satoken.annotation.SaCheckPermission; import jakarta.servlet.http.HttpServletResponse; import lombok.RequiredArgsConstructor; import org.springframework.web.bind.annotation.*; @@ -30,6 +31,7 @@ public class RecordScanController { * @param pageIndex 页码 * @return 扫码记录表列表 */ + @SaCheckPermission("recordScan:query") @PostMapping("/queryWithPage") public AppServeDataResponse> queryRecordScan(@RequestBody QueryRecordScanReq request, @RequestParam("pageSize") Integer pageSize, @RequestParam("pageIndex") Integer pageIndex) { return recordScanService.queryRecordScan(request, pageSize, pageIndex); @@ -40,6 +42,7 @@ public class RecordScanController { * @param request 查询参数 * @return 扫码率 */ + @SaCheckPermission("recordScan:query") @PostMapping("/queryScanRatio") public AppServeDataResponse queryRecordScanRatio(@RequestBody QueryRecordScanReq request) { return recordScanService.queryRecordScanRatio(request); @@ -50,6 +53,7 @@ public class RecordScanController { * @param response 响应 * @param request 扫码记录表查询参数 */ + @SaCheckPermission("recordScan:export") @PostMapping("/downLoadRecordScan") public void downLoadRecordScan(HttpServletResponse response, @RequestBody QueryRecordScanReq request) { recordScanService.downLoadRecordScan(response, request); diff --git a/wcs/src/main/java/org/wcs/serve/controller/app/SiemensDbController.java b/wcs/src/main/java/org/wcs/serve/controller/app/SiemensDbController.java index 33ee4ba..47fee3a 100644 --- a/wcs/src/main/java/org/wcs/serve/controller/app/SiemensDbController.java +++ b/wcs/src/main/java/org/wcs/serve/controller/app/SiemensDbController.java @@ -1,5 +1,6 @@ package org.wcs.serve.controller.app; +import cn.dev33.satoken.annotation.SaCheckPermission; import lombok.RequiredArgsConstructor; import org.springframework.validation.annotation.Validated; import org.springframework.web.bind.annotation.*; @@ -30,6 +31,7 @@ public class SiemensDbController { * @param request 查询参数 * @return 查询结果 */ + @SaCheckPermission("siemensDbManage:query") @PostMapping("/querySiemensDbByPage") public AppServeDataResponse> querySiemensDb(@RequestParam("pageIndex") Integer pageIndex, @RequestParam("pageSize") Integer pageSize, @RequestBody QuerySiemensDbReq request) { return siemensDbService.querySiemensDb(pageIndex, pageSize, request); @@ -40,6 +42,7 @@ public class SiemensDbController { * @param request 新增参数 * @return 新增结果 */ + @SaCheckPermission("siemensDbManage:add") @PostMapping("/addSiemensDb") public AppServeResponse addSiemensDb(@RequestBody @Validated AddSiemensDbReq request) { return siemensDbService.addSiemensDb(request); @@ -50,6 +53,7 @@ public class SiemensDbController { * @param request 修改参数 * @return 修改结果 */ + @SaCheckPermission("siemensDbManage:edit") @PostMapping("/updateSiemensDb") public AppServeResponse updateSiemensDb(@RequestBody @Validated UpdateSiemensDbReq request) { return siemensDbService.updateSiemensDb(request); @@ -60,6 +64,7 @@ public class SiemensDbController { * @param dbName DB名称 * @return 删除结果 */ + @SaCheckPermission("siemensDbManage:delete") @DeleteMapping("/deleteSiemensDb") public AppServeResponse deleteSiemensDb(@RequestParam("dbName") String dbName) { return siemensDbService.deleteSiemensDb(dbName); @@ -69,6 +74,7 @@ public class SiemensDbController { * 重新加载DB地址 * @return 重新加载结果 */ + @SaCheckPermission("siemensDbManage:reload") @PutMapping("/reloadDbAddress") public AppServeResponse reloadDbAddress() { return siemensDbService.reloadDbAddress(); diff --git a/wcs/src/main/resources/application-dev.yml b/wcs/src/main/resources/application-dev.yml index 3924f32..424e4a3 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_java_demo?characterEncoding=utf8&useSSL=false&useUnicode=true&serverTimezone=Asia/Shanghai&allowPublicKeyRetrieval=true + url: jdbc:mysql://127.0.0.1:3306/wcs?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: developer - password: developer + username: root + password: Root123456 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 d911ee3..d9fc548 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://112.4.208.194:3002/wcsDemoServe/api/wcsdev', + baseURL: 'http://localhost:9970/api/wcsdev', timeout: 30000, headers: { "Content-Type": "application/json" diff --git a/wcs_web/src/components/page/etagTask/EditEtagTaskBak.vue b/wcs_web/src/components/page/etagTask/EditEtagTaskBak.vue index 67bce2b..901ce1b 100644 --- a/wcs_web/src/components/page/etagTask/EditEtagTaskBak.vue +++ b/wcs_web/src/components/page/etagTask/EditEtagTaskBak.vue @@ -115,10 +115,8 @@ const confirm = () => { - -