diff --git a/.cursor/cursorrules-backend.md b/.cursor/cursorrules-backend.md index c643cb5a..0e9fa626 100644 --- a/.cursor/cursorrules-backend.md +++ b/.cursor/cursorrules-backend.md @@ -741,6 +741,29 @@ public class UserBo { } ``` +#### 🔴 请求参数名必须显式声明(强制性) + +**背景**:生产环境若未使用 `-parameters` 编译,Spring 无法通过反射获取方法参数名,会报错: +`Name for argument of type [java.lang.Long] not specified, and parameter name information not available via reflection.` + +**强制要求**:`@RequestParam` / `@PathVariable` 必须写明参数名,禁止依赖编译器保留参数名。 + +```java +// ✅ 正确 +@PutMapping("/authUser/selectAll") +public R selectAuthUserAll(@RequestParam("roleId") Long roleId, + @RequestParam("userIds") Long[] userIds) { ... } + +@GetMapping("/{roleId}") +public R getInfo(@PathVariable("roleId") Long roleId) { ... } + +// ❌ 错误(本地 IDEA 可能正常,生产易 500) +public R selectAuthUserAll(Long roleId, Long[] userIds) { ... } +public R getInfo(@PathVariable Long roleId) { ... } +``` + +父 POM 已配置 `true` 与 `-parameters` 作为兜底,但接口代码仍必须显式声明参数名。 + #### 🚨 接口开发检查清单 **每个新接口必须检查**: @@ -752,6 +775,7 @@ public class UserBo { - [ ] 是否添加了@SaCheckPermission 权限注解? - [ ] 是否添加了@Operation 接口描述? - [ ] 是否进行了参数校验? +- [ ] `@RequestParam`/`@PathVariable` 是否显式声明了参数名? - [ ] 是否符合 RESTful 命名规范? - [ ] 是否包含了必要的请求头(clientid、Content-Type 等)? - [ ] 是否在 API 文档中记录了接口信息? diff --git a/backend/package-prod.sh b/backend/package-prod.sh new file mode 100755 index 00000000..ad626a84 --- /dev/null +++ b/backend/package-prod.sh @@ -0,0 +1,18 @@ +#!/usr/bin/env bash +# 生产环境打包脚本 +# 强制保留方法参数名,避免 Spring 在生产环境无法绑定请求参数 +set -euo pipefail + +cd "$(dirname "$0")" + +echo "==> 开始生产打包: mvn clean package -Pprod -Dmaven.compiler.parameters=true" +mvn clean package -Pprod -Dmaven.compiler.parameters=true "$@" + +JAR="ruoyi-admin/target/ruoyi-admin.jar" +if [[ -f "$JAR" ]]; then + echo "==> 打包成功: $JAR" + ls -lh "$JAR" +else + echo "==> 未找到 $JAR,请检查构建日志" >&2 + exit 1 +fi diff --git a/backend/pom.xml b/backend/pom.xml index 417a8c33..9ddb0000 100644 --- a/backend/pom.xml +++ b/backend/pom.xml @@ -17,6 +17,8 @@ UTF-8 UTF-8 17 + + true 3.5.16 2.8.8 0.15.0 @@ -480,6 +482,8 @@ ${mapstruct-plus.lombok.version} + + true -parameters diff --git a/backend/ruoyi-admin/src/main/java/org/dromara/web/controller/AuthController.java b/backend/ruoyi-admin/src/main/java/org/dromara/web/controller/AuthController.java index 46a7518d..996fbed9 100644 --- a/backend/ruoyi-admin/src/main/java/org/dromara/web/controller/AuthController.java +++ b/backend/ruoyi-admin/src/main/java/org/dromara/web/controller/AuthController.java @@ -118,7 +118,7 @@ public class AuthController { */ @GetMapping("/binding/{source}") public R authBinding(@PathVariable("source") String source, - @RequestParam String tenantId, @RequestParam String domain) { + @RequestParam("tenantId") String tenantId, @RequestParam("domain") String domain) { SocialLoginConfigProperties obj = socialProperties.getType().get(source); if (ObjectUtil.isNull(obj)) { return R.fail(source + "平台账号暂不支持"); @@ -161,7 +161,7 @@ public class AuthController { * @param socialId socialId */ @DeleteMapping(value = "/unlock/{socialId}") - public R unlockSocial(@PathVariable Long socialId) { + public R unlockSocial(@PathVariable("socialId") Long socialId) { // 校验token StpUtil.checkLogin(); Boolean rows = socialUserService.deleteWithValidById(socialId); diff --git a/backend/ruoyi-modules/ruoyi-bzrkh/src/main/java/org/dromara/bzrkh/controller/AssessmentApprovalController.java b/backend/ruoyi-modules/ruoyi-bzrkh/src/main/java/org/dromara/bzrkh/controller/AssessmentApprovalController.java index 61747c41..07196780 100644 --- a/backend/ruoyi-modules/ruoyi-bzrkh/src/main/java/org/dromara/bzrkh/controller/AssessmentApprovalController.java +++ b/backend/ruoyi-modules/ruoyi-bzrkh/src/main/java/org/dromara/bzrkh/controller/AssessmentApprovalController.java @@ -105,7 +105,7 @@ public class AssessmentApprovalController extends BaseController { // @SaCheckPermission("bzrkh:assessmentApproval:delete") @Log(title = "班主任考核审核", businessType = BusinessType.DELETE) @DeleteMapping("/deleteAbnormalRecord") - public R deleteAbnormalRecord(@RequestParam Long planId, @RequestParam Long evaluatedUserId) { + public R deleteAbnormalRecord(@RequestParam("planId") Long planId, @RequestParam("evaluatedUserId") Long evaluatedUserId) { boolean result = assessmentApprovalService.deleteAbnormalRecord(planId, evaluatedUserId); return result ? R.ok() : R.fail("删除异常记录失败"); } diff --git a/backend/ruoyi-modules/ruoyi-bzrkh/src/main/java/org/dromara/bzrkh/controller/BmzrAssessmentIndicatorController.java b/backend/ruoyi-modules/ruoyi-bzrkh/src/main/java/org/dromara/bzrkh/controller/BmzrAssessmentIndicatorController.java index 3e108bf7..b09ff7bf 100644 --- a/backend/ruoyi-modules/ruoyi-bzrkh/src/main/java/org/dromara/bzrkh/controller/BmzrAssessmentIndicatorController.java +++ b/backend/ruoyi-modules/ruoyi-bzrkh/src/main/java/org/dromara/bzrkh/controller/BmzrAssessmentIndicatorController.java @@ -73,7 +73,7 @@ public class BmzrAssessmentIndicatorController extends BaseController { */ // @SaCheckPermission("bzrkh:assessmentIndicator:query") @GetMapping("/{id}") - public R getInfo(@NotNull(message = "主键不能为空") @PathVariable Long id) { + public R getInfo(@NotNull(message = "主键不能为空") @PathVariable("id") Long id) { return R.ok(bmzrAssessmentIndicatorService.queryById(id)); } @@ -107,7 +107,7 @@ public class BmzrAssessmentIndicatorController extends BaseController { // @SaCheckPermission("bzrkh:assessmentIndicator:remove") @Log(title = "班主任考核指标体系", businessType = BusinessType.DELETE) @DeleteMapping("/{ids}") - public R remove(@NotEmpty(message = "主键不能为空") @PathVariable Long[] ids) { + public R remove(@NotEmpty(message = "主键不能为空") @PathVariable("ids") Long[] ids) { return toAjax(bmzrAssessmentIndicatorService.deleteWithValidByIds(List.of(ids), true)); } } diff --git a/backend/ruoyi-modules/ruoyi-bzrkh/src/main/java/org/dromara/bzrkh/controller/BmzrAssessmentIndicatorTypeController.java b/backend/ruoyi-modules/ruoyi-bzrkh/src/main/java/org/dromara/bzrkh/controller/BmzrAssessmentIndicatorTypeController.java index 982e4c61..e2d0f0e1 100644 --- a/backend/ruoyi-modules/ruoyi-bzrkh/src/main/java/org/dromara/bzrkh/controller/BmzrAssessmentIndicatorTypeController.java +++ b/backend/ruoyi-modules/ruoyi-bzrkh/src/main/java/org/dromara/bzrkh/controller/BmzrAssessmentIndicatorTypeController.java @@ -73,7 +73,7 @@ public class BmzrAssessmentIndicatorTypeController extends BaseController { */ // @SaCheckPermission("bzrkh:assessmentIndicatorType:query") @GetMapping("/{id}") - public R getInfo(@NotNull(message = "主键不能为空") @PathVariable Long id) { + public R getInfo(@NotNull(message = "主键不能为空") @PathVariable("id") Long id) { return R.ok(bmzrAssessmentIndicatorTypeService.queryById(id)); } @@ -107,7 +107,7 @@ public class BmzrAssessmentIndicatorTypeController extends BaseController { // @SaCheckPermission("bzrkh:assessmentIndicatorType:remove") @Log(title = "班主任考核指标类型", businessType = BusinessType.DELETE) @DeleteMapping("/{ids}") - public R remove(@NotEmpty(message = "主键不能为空") @PathVariable Long[] ids) { + public R remove(@NotEmpty(message = "主键不能为空") @PathVariable("ids") Long[] ids) { return toAjax(bmzrAssessmentIndicatorTypeService.deleteWithValidByIds(List.of(ids), true)); } } diff --git a/backend/ruoyi-modules/ruoyi-bzrkh/src/main/java/org/dromara/bzrkh/controller/BmzrAssessmentPlanController.java b/backend/ruoyi-modules/ruoyi-bzrkh/src/main/java/org/dromara/bzrkh/controller/BmzrAssessmentPlanController.java index 1f1977d1..e65bed74 100644 --- a/backend/ruoyi-modules/ruoyi-bzrkh/src/main/java/org/dromara/bzrkh/controller/BmzrAssessmentPlanController.java +++ b/backend/ruoyi-modules/ruoyi-bzrkh/src/main/java/org/dromara/bzrkh/controller/BmzrAssessmentPlanController.java @@ -61,7 +61,7 @@ public class BmzrAssessmentPlanController extends BaseController { */ // @SaCheckPermission("bzrkh:assessmentPlan:query") @GetMapping("/{id}") - public R getInfo(@NotNull(message = "主键不能为空") @PathVariable Long id) { + public R getInfo(@NotNull(message = "主键不能为空") @PathVariable("id") Long id) { return R.ok(bmzrAssessmentPlanService.queryById(id)); } @@ -93,7 +93,7 @@ public class BmzrAssessmentPlanController extends BaseController { // @SaCheckPermission("bzrkh:assessmentPlan:remove") @Log(title = "班主任考核计划", businessType = BusinessType.DELETE) @DeleteMapping("/{ids}") - public R remove(@NotEmpty(message = "主键不能为空") @PathVariable Long[] ids) { + public R remove(@NotEmpty(message = "主键不能为空") @PathVariable("ids") Long[] ids) { return toAjax(bmzrAssessmentPlanService.deleteWithValidByIds(List.of(ids), true)); } diff --git a/backend/ruoyi-modules/ruoyi-bzrkh/src/main/java/org/dromara/bzrkh/controller/BmzrAssessmentSchemeController.java b/backend/ruoyi-modules/ruoyi-bzrkh/src/main/java/org/dromara/bzrkh/controller/BmzrAssessmentSchemeController.java index bd894644..98bb6d1f 100644 --- a/backend/ruoyi-modules/ruoyi-bzrkh/src/main/java/org/dromara/bzrkh/controller/BmzrAssessmentSchemeController.java +++ b/backend/ruoyi-modules/ruoyi-bzrkh/src/main/java/org/dromara/bzrkh/controller/BmzrAssessmentSchemeController.java @@ -65,7 +65,7 @@ public class BmzrAssessmentSchemeController extends BaseController { */ // @SaCheckPermission("bzrkh:assessmentScheme:query") @GetMapping("/{id}") - public R getInfo(@NotNull(message = "主键不能为空") @PathVariable Long id) { + public R getInfo(@NotNull(message = "主键不能为空") @PathVariable("id") Long id) { return R.ok(bmzrAssessmentSchemeService.queryById(id)); } @@ -97,7 +97,7 @@ public class BmzrAssessmentSchemeController extends BaseController { // @SaCheckPermission("bzrkh:assessmentScheme:remove") @Log(title = "班主任考核方案", businessType = BusinessType.DELETE) @DeleteMapping("/{ids}") - public R remove(@NotEmpty(message = "主键不能为空") @PathVariable Long[] ids) { + public R remove(@NotEmpty(message = "主键不能为空") @PathVariable("ids") Long[] ids) { return toAjax(bmzrAssessmentSchemeService.deleteWithValidByIds(List.of(ids), true)); } } diff --git a/backend/ruoyi-modules/ruoyi-bzrkh/src/main/java/org/dromara/bzrkh/controller/BmzrAssessmentSchemeIndicatorController.java b/backend/ruoyi-modules/ruoyi-bzrkh/src/main/java/org/dromara/bzrkh/controller/BmzrAssessmentSchemeIndicatorController.java index 1f9b8d45..650748a4 100644 --- a/backend/ruoyi-modules/ruoyi-bzrkh/src/main/java/org/dromara/bzrkh/controller/BmzrAssessmentSchemeIndicatorController.java +++ b/backend/ruoyi-modules/ruoyi-bzrkh/src/main/java/org/dromara/bzrkh/controller/BmzrAssessmentSchemeIndicatorController.java @@ -51,7 +51,7 @@ public class BmzrAssessmentSchemeIndicatorController extends BaseController { */ // @SaCheckPermission("bzrkh:assessmentSchemeIndicator:list") @GetMapping("/listBySchemeId/{schemeId}") - public R> listBySchemeId(@PathVariable Long schemeId) { + public R> listBySchemeId(@PathVariable("schemeId") Long schemeId) { List list = bmzrAssessmentSchemeIndicatorService.queryBySchemeId(schemeId); return R.ok(list); } @@ -74,7 +74,7 @@ public class BmzrAssessmentSchemeIndicatorController extends BaseController { */ // @SaCheckPermission("bzrkh:assessmentSchemeIndicator:query") @GetMapping("/{id}") - public R getInfo(@NotNull(message = "主键不能为空") @PathVariable Long id) { + public R getInfo(@NotNull(message = "主键不能为空") @PathVariable("id") Long id) { return R.ok(bmzrAssessmentSchemeIndicatorService.queryById(id)); } @@ -108,7 +108,7 @@ public class BmzrAssessmentSchemeIndicatorController extends BaseController { // @SaCheckPermission("bzrkh:assessmentSchemeIndicator:remove") @Log(title = "班主任考核方案指标关联", businessType = BusinessType.DELETE) @DeleteMapping("/{ids}") - public R remove(@NotEmpty(message = "主键不能为空") @PathVariable Long[] ids) { + public R remove(@NotEmpty(message = "主键不能为空") @PathVariable("ids") Long[] ids) { return toAjax(bmzrAssessmentSchemeIndicatorService.deleteWithValidByIds(List.of(ids), true)); } @@ -122,7 +122,7 @@ public class BmzrAssessmentSchemeIndicatorController extends BaseController { @Log(title = "批量保存方案指标关联", businessType = BusinessType.UPDATE) @RepeatSubmit() @PostMapping("/batchSave/{schemeId}") - public R batchSave(@PathVariable Long schemeId, + public R batchSave(@PathVariable("schemeId") Long schemeId, @RequestBody List indicatorList) { return toAjax(bmzrAssessmentSchemeIndicatorService.batchSaveSchemeIndicators(schemeId, indicatorList)); } diff --git a/backend/ruoyi-modules/ruoyi-bzrkh/src/main/java/org/dromara/bzrkh/controller/TeacherAssessmentController.java b/backend/ruoyi-modules/ruoyi-bzrkh/src/main/java/org/dromara/bzrkh/controller/TeacherAssessmentController.java index 5a5be67a..864b2c44 100644 --- a/backend/ruoyi-modules/ruoyi-bzrkh/src/main/java/org/dromara/bzrkh/controller/TeacherAssessmentController.java +++ b/backend/ruoyi-modules/ruoyi-bzrkh/src/main/java/org/dromara/bzrkh/controller/TeacherAssessmentController.java @@ -44,7 +44,7 @@ public class TeacherAssessmentController extends BaseController { */ // @SaCheckPermission("bzrkh:teacherAssessment:list") @GetMapping("/classes") - public R> getTeacherClasses(@RequestParam(required = false) Long teacherId) { + public R> getTeacherClasses(@RequestParam(value = "teacherId", required = false) Long teacherId) { // 如果没有传入teacherId,则使用当前登录用户ID Long currentTeacherId = teacherId != null ? teacherId : LoginHelper.getUserId(); List list = teacherAssessmentService.queryTeacherClassList(currentTeacherId); @@ -105,7 +105,7 @@ public class TeacherAssessmentController extends BaseController { */ // @SaCheckPermission("bzrkh:teacherAssessment:detail") @GetMapping("/detail") - public R getAssessmentDetail(@RequestParam Long planId, @RequestParam Long classId) { + public R getAssessmentDetail(@RequestParam("planId") Long planId, @RequestParam("classId") Long classId) { Long teacherId = LoginHelper.getUserId(); Object detail = teacherAssessmentService.getAssessmentDetail(planId, classId, teacherId); return R.ok(detail); @@ -116,7 +116,7 @@ public class TeacherAssessmentController extends BaseController { */ // @SaCheckPermission("bzrkh:teacherAssessment:detail") @GetMapping("/submitDetail") - public R getAssessmentSubmitDetail(@RequestParam Long planId, @RequestParam Long classId) { + public R getAssessmentSubmitDetail(@RequestParam("planId") Long planId, @RequestParam("classId") Long classId) { Long teacherId = LoginHelper.getUserId(); AssessmentDetailVo detail = teacherAssessmentService.getAssessmentSubmitDetail(planId, classId, teacherId); return R.ok(detail); @@ -148,7 +148,7 @@ public class TeacherAssessmentController extends BaseController { * 用于验证特定人数的系数计算是否正确 */ @GetMapping("/testCoefficient") - public R testStudentCountCoefficient(@RequestParam int studentCount) { + public R testStudentCountCoefficient(@RequestParam("studentCount") int studentCount) { BigDecimal coefficient = teacherAssessmentService.testStudentCountCoefficient(studentCount); return R.ok("学生人数: " + studentCount + ", 计算系数: " + coefficient); } @@ -158,7 +158,7 @@ public class TeacherAssessmentController extends BaseController { */ // @SaCheckPermission("bzrkh:teacherAssessment:detail") @GetMapping("/classStudentRecords") - public R getClassStudentRecords(@RequestParam Long classId, @RequestParam Long planId) { + public R getClassStudentRecords(@RequestParam("classId") Long classId, @RequestParam("planId") Long planId) { ClassStudentRecordsVo records = teacherAssessmentService.queryClassStudentRecords(classId, planId); return R.ok(records); } diff --git a/backend/ruoyi-modules/ruoyi-cw/src/main/java/org/dromara/cw/controller/CwApprovalRecordController.java b/backend/ruoyi-modules/ruoyi-cw/src/main/java/org/dromara/cw/controller/CwApprovalRecordController.java index 484eb25f..bd6e4e29 100644 --- a/backend/ruoyi-modules/ruoyi-cw/src/main/java/org/dromara/cw/controller/CwApprovalRecordController.java +++ b/backend/ruoyi-modules/ruoyi-cw/src/main/java/org/dromara/cw/controller/CwApprovalRecordController.java @@ -66,7 +66,7 @@ public class CwApprovalRecordController extends BaseController { */ // @SaCheckPermission("cw:approval:query") @GetMapping("/{id}") - public R getInfo(@NotNull(message = "主键不能为空") @PathVariable Long id) { + public R getInfo(@NotNull(message = "主键不能为空") @PathVariable("id") Long id) { return R.ok(approvalRecordService.queryById(id)); } @@ -75,7 +75,7 @@ public class CwApprovalRecordController extends BaseController { */ // @SaCheckPermission("cw:approval:query") @GetMapping("/byApplication/{applicationId}") - public R> getByApplicationId(@PathVariable Long applicationId) { + public R> getByApplicationId(@PathVariable("applicationId") Long applicationId) { List list = approvalRecordService.queryByApplicationId(applicationId); return R.ok(list); } @@ -188,7 +188,7 @@ public class CwApprovalRecordController extends BaseController { // @SaCheckPermission("cw:approval:remove") @Log(title = "审批记录", businessType = BusinessType.DELETE) @DeleteMapping("/{ids}") - public R remove(@NotEmpty(message = "主键不能为空") @PathVariable Long[] ids) { + public R remove(@NotEmpty(message = "主键不能为空") @PathVariable("ids") Long[] ids) { return toAjax(approvalRecordService.deleteWithValidByIds(List.of(ids), true)); } @@ -198,7 +198,7 @@ public class CwApprovalRecordController extends BaseController { // @SaCheckPermission("cw:approval:create") @Log(title = "创建审批流程", businessType = BusinessType.INSERT) @PostMapping("/create/{applicationId}") - public R createProcess(@PathVariable Long applicationId, @RequestParam String applicationNo) { + public R createProcess(@PathVariable("applicationId") Long applicationId, @RequestParam("applicationNo") String applicationNo) { // 收集当前用户上下文信息 Long currentUserId = LoginHelper.getUserId(); String currentUserName = LoginHelper.getUsername(); @@ -217,10 +217,10 @@ public class CwApprovalRecordController extends BaseController { @Log(title = "审批操作", businessType = BusinessType.UPDATE) @RepeatSubmit() @PostMapping("/process") - public R processApproval(@RequestParam Long applicationId, - @RequestParam String nodeCode, - @RequestParam String approveAction, - @RequestParam(required = false) String approveOpinion) { + public R processApproval(@RequestParam("applicationId") Long applicationId, + @RequestParam("nodeCode") String nodeCode, + @RequestParam("approveAction") String approveAction, + @RequestParam(value = "approveOpinion", required = false) String approveOpinion) { return toAjax(approvalRecordService.processApproval(applicationId, nodeCode, approveAction, approveOpinion)); } @@ -231,9 +231,9 @@ public class CwApprovalRecordController extends BaseController { @Log(title = "部门审批", businessType = BusinessType.UPDATE) @RepeatSubmit() @PostMapping("/dept") - public R deptApprove(@RequestParam Long applicationId, - @RequestParam String approveAction, - @RequestParam(required = false) String approveOpinion) { + public R deptApprove(@RequestParam("applicationId") Long applicationId, + @RequestParam("approveAction") String approveAction, + @RequestParam(value = "approveOpinion", required = false) String approveOpinion) { return toAjax(approvalRecordService.deptApprove(applicationId, approveAction, approveOpinion)); } @@ -242,7 +242,7 @@ public class CwApprovalRecordController extends BaseController { */ // @SaCheckPermission("cw:approval:query") @GetMapping("/current/{applicationId}") - public R getCurrentNode(@PathVariable Long applicationId) { + public R getCurrentNode(@PathVariable("applicationId") Long applicationId) { CwApprovalRecordVo record = approvalRecordService.queryCurrentApprovalNode(applicationId); return R.ok(record); } @@ -252,7 +252,7 @@ public class CwApprovalRecordController extends BaseController { */ // @SaCheckPermission("cw:approval:check") @GetMapping("/check/{applicationId}") - public R checkPermission(@PathVariable Long applicationId, @RequestParam String nodeCode) { + public R checkPermission(@PathVariable("applicationId") Long applicationId, @RequestParam("nodeCode") String nodeCode) { Boolean hasPermission = approvalRecordService.checkApprovalPermission(applicationId, nodeCode); return R.ok(hasPermission); } @@ -262,7 +262,7 @@ public class CwApprovalRecordController extends BaseController { */ // @SaCheckPermission("cw:approval:dept") @GetMapping("/check/dept/{applicationId}") - public R checkDeptPermission(@PathVariable Long applicationId) { + public R checkDeptPermission(@PathVariable("applicationId") Long applicationId) { Boolean hasPermission = approvalRecordService.checkDeptApprovalPermission(applicationId); return R.ok(hasPermission); } @@ -272,7 +272,7 @@ public class CwApprovalRecordController extends BaseController { */ // @SaCheckPermission("cw:approval:finance") @GetMapping("/approvers/{applicationId}") - public R>> getAvailableApprovers(@PathVariable Long applicationId) { + public R>> getAvailableApprovers(@PathVariable("applicationId") Long applicationId) { List> approvers = approvalRecordService.getAvailableApprovers(applicationId); return R.ok(approvers); } @@ -282,9 +282,9 @@ public class CwApprovalRecordController extends BaseController { */ // @SaCheckPermission("cw:approval:leader") @PostMapping("/leader") - public R leaderApproval(@RequestParam Long applicationId, - @RequestParam String approveAction, - @RequestParam String approveOpinion) { + public R leaderApproval(@RequestParam("applicationId") Long applicationId, + @RequestParam("approveAction") String approveAction, + @RequestParam("approveOpinion") String approveOpinion) { log.info("🔍 分管领导审批:applicationId={}, approveAction={}, approveOpinion={}", applicationId, approveAction, approveOpinion); @@ -307,10 +307,10 @@ public class CwApprovalRecordController extends BaseController { */ // @SaCheckPermission("cw:approval:finance") @PostMapping("/finance") - public R financeApproval(@RequestParam Long applicationId, - @RequestParam String approveAction, - @RequestParam String approveOpinion, - @RequestParam(required = false) Long selectedApproverId) { + public R financeApproval(@RequestParam("applicationId") Long applicationId, + @RequestParam("approveAction") String approveAction, + @RequestParam("approveOpinion") String approveOpinion, + @RequestParam(value = "selectedApproverId", required = false) Long selectedApproverId) { log.info("🔍 财务审批:applicationId={}, approveAction={}, approveOpinion={}, selectedApproverId={}", applicationId, approveAction, approveOpinion, selectedApproverId); diff --git a/backend/ruoyi-modules/ruoyi-cw/src/main/java/org/dromara/cw/controller/CwMonitoringManagementController.java b/backend/ruoyi-modules/ruoyi-cw/src/main/java/org/dromara/cw/controller/CwMonitoringManagementController.java index 9f925e7d..b36910cf 100644 --- a/backend/ruoyi-modules/ruoyi-cw/src/main/java/org/dromara/cw/controller/CwMonitoringManagementController.java +++ b/backend/ruoyi-modules/ruoyi-cw/src/main/java/org/dromara/cw/controller/CwMonitoringManagementController.java @@ -51,7 +51,7 @@ public class CwMonitoringManagementController extends BaseController { */ //@SaCheckPermission("cw:monitoringManagement:query") @GetMapping("/{id}") - public R getInfo(@NotNull(message = "主键不能为空") @PathVariable Long id) { + public R getInfo(@NotNull(message = "主键不能为空") @PathVariable("id") Long id) { return R.ok(monitoringManagementService.queryById(id)); } @@ -62,7 +62,7 @@ public class CwMonitoringManagementController extends BaseController { @Log(title = "运行监控管理", businessType = BusinessType.UPDATE) @RepeatSubmit() @PostMapping("/lock/{id}") - public R lock(@NotNull(message = "主键不能为空") @PathVariable Long id) { + public R lock(@NotNull(message = "主键不能为空") @PathVariable("id") Long id) { return toAjax(monitoringManagementService.lockEvaluation(id)); } @@ -73,7 +73,7 @@ public class CwMonitoringManagementController extends BaseController { @Log(title = "运行监控管理", businessType = BusinessType.UPDATE) @RepeatSubmit() @PostMapping("/unlock/{id}") - public R unlock(@NotNull(message = "主键不能为空") @PathVariable Long id) { + public R unlock(@NotNull(message = "主键不能为空") @PathVariable("id") Long id) { return toAjax(monitoringManagementService.unlockEvaluation(id)); } diff --git a/backend/ruoyi-modules/ruoyi-cw/src/main/java/org/dromara/cw/controller/CwPerformanceMonitoringController.java b/backend/ruoyi-modules/ruoyi-cw/src/main/java/org/dromara/cw/controller/CwPerformanceMonitoringController.java index b6d66e33..2ecfdfb9 100644 --- a/backend/ruoyi-modules/ruoyi-cw/src/main/java/org/dromara/cw/controller/CwPerformanceMonitoringController.java +++ b/backend/ruoyi-modules/ruoyi-cw/src/main/java/org/dromara/cw/controller/CwPerformanceMonitoringController.java @@ -37,7 +37,7 @@ public class CwPerformanceMonitoringController extends BaseController { */ //@SaCheckPermission("cw:performanceMonitoring:query") @GetMapping("/list/{evaluationId}") - public R> listByEvaluationId(@NotNull(message = "自评ID不能为空") @PathVariable Long evaluationId) { + public R> listByEvaluationId(@NotNull(message = "自评ID不能为空") @PathVariable("evaluationId") Long evaluationId) { return R.ok(performanceMonitoringService.queryByEvaluationId(evaluationId)); } @@ -46,7 +46,7 @@ public class CwPerformanceMonitoringController extends BaseController { */ //@SaCheckPermission("cw:performanceMonitoring:query") @GetMapping("/{id}") - public R getInfo(@NotNull(message = "主键不能为空") @PathVariable Long id) { + public R getInfo(@NotNull(message = "主键不能为空") @PathVariable("id") Long id) { return R.ok(performanceMonitoringService.queryById(id)); } @@ -78,7 +78,7 @@ public class CwPerformanceMonitoringController extends BaseController { //@SaCheckPermission("cw:performanceMonitoring:remove") @Log(title = "绩效运行监控", businessType = BusinessType.DELETE) @DeleteMapping("/{id}") - public R remove(@NotNull(message = "主键不能为空") @PathVariable Long id) { + public R remove(@NotNull(message = "主键不能为空") @PathVariable("id") Long id) { return toAjax(performanceMonitoringService.deleteWithValidByIds(List.of(id), true)); } } diff --git a/backend/ruoyi-modules/ruoyi-cw/src/main/java/org/dromara/cw/controller/CwProjectApplicationController.java b/backend/ruoyi-modules/ruoyi-cw/src/main/java/org/dromara/cw/controller/CwProjectApplicationController.java index 93b0f75e..99c08089 100644 --- a/backend/ruoyi-modules/ruoyi-cw/src/main/java/org/dromara/cw/controller/CwProjectApplicationController.java +++ b/backend/ruoyi-modules/ruoyi-cw/src/main/java/org/dromara/cw/controller/CwProjectApplicationController.java @@ -54,7 +54,7 @@ public class CwProjectApplicationController extends BaseController { */ //@SaCheckPermission("cw:application:list") @GetMapping("/myList") - public R> myList(@RequestParam(required = false) Integer year) { + public R> myList(@RequestParam(value = "year", required = false) Integer year) { Long applicantId = LoginHelper.getUserId(); List list = projectApplicationService.queryMyApplications(applicantId, year); return R.ok(list); @@ -65,7 +65,7 @@ public class CwProjectApplicationController extends BaseController { */ //@SaCheckPermission("cw:application:list") @GetMapping("/deptList") - public R> deptList(@RequestParam Long departmentId, @RequestParam(required = false) Integer year) { + public R> deptList(@RequestParam("departmentId") Long departmentId, @RequestParam(value = "year", required = false) Integer year) { List list = projectApplicationService.queryDeptApplications(departmentId, year); return R.ok(list); } @@ -115,7 +115,7 @@ public class CwProjectApplicationController extends BaseController { */ //@SaCheckPermission("cw:statistics:list") @GetMapping("/statistics/status") - public R> getStatusStatistics(@RequestParam(required = false) String budgetYear) { + public R> getStatusStatistics(@RequestParam(value = "budgetYear", required = false) String budgetYear) { Map statistics = projectApplicationService.getStatusStatistics(budgetYear); return R.ok(statistics); } @@ -125,7 +125,7 @@ public class CwProjectApplicationController extends BaseController { */ //@SaCheckPermission("cw:statistics:list") @GetMapping("/statistics/department") - public R>> getDepartmentStatistics(@RequestParam(required = false) String budgetYear) { + public R>> getDepartmentStatistics(@RequestParam(value = "budgetYear", required = false) String budgetYear) { List> statistics = projectApplicationService.getDepartmentStatistics(budgetYear); return R.ok(statistics); } @@ -146,7 +146,7 @@ public class CwProjectApplicationController extends BaseController { //@SaCheckPermission("cw:application:query") @GetMapping("/{id}") public R getInfo(@NotNull(message = "主键不能为空") - @PathVariable Long id) { + @PathVariable("id") Long id) { return R.ok(projectApplicationService.queryById(id)); } @@ -155,7 +155,7 @@ public class CwProjectApplicationController extends BaseController { */ //@SaCheckPermission("cw:application:query") @GetMapping("/byNo/{applicationNo}") - public R getInfoByNo(@PathVariable String applicationNo) { + public R getInfoByNo(@PathVariable("applicationNo") String applicationNo) { return R.ok(projectApplicationService.queryByApplicationNo(applicationNo)); } @@ -217,7 +217,7 @@ public class CwProjectApplicationController extends BaseController { @Log(title = "提交项目预算申报", businessType = BusinessType.UPDATE) @RepeatSubmit() @PostMapping("/submit/{id}") - public R submit(@PathVariable Long id) { + public R submit(@PathVariable("id") Long id) { return toAjax(projectApplicationService.submitApplication(id)); } @@ -227,7 +227,7 @@ public class CwProjectApplicationController extends BaseController { //@SaCheckPermission("cw:application:edit") @Log(title = "撤回项目预算申报", businessType = BusinessType.UPDATE) @PostMapping("/withdraw/{id}") - public R withdraw(@PathVariable Long id) { + public R withdraw(@PathVariable("id") Long id) { return toAjax(projectApplicationService.withdrawApplication(id)); } @@ -237,7 +237,7 @@ public class CwProjectApplicationController extends BaseController { //@SaCheckPermission("cw:application:remove") @Log(title = "取消项目预算申报", businessType = BusinessType.UPDATE) @PostMapping("/cancel/{id}") - public R cancel(@PathVariable Long id) { + public R cancel(@PathVariable("id") Long id) { return toAjax(projectApplicationService.cancelApplication(id)); } @@ -248,7 +248,7 @@ public class CwProjectApplicationController extends BaseController { @Log(title = "项目预算申报", businessType = BusinessType.DELETE) @DeleteMapping("/{ids}") public R remove(@NotEmpty(message = "主键不能为空") - @PathVariable Long[] ids) { + @PathVariable("ids") Long[] ids) { return toAjax(projectApplicationService.deleteWithValidByIds(List.of(ids), true)); } @@ -266,7 +266,7 @@ public class CwProjectApplicationController extends BaseController { */ //@SaCheckPermission("cw:application:list") @GetMapping("/statistics") - public R> statistics(@RequestParam(required = false) Integer year) { + public R> statistics(@RequestParam(value = "year", required = false) Integer year) { java.util.Map result = new java.util.HashMap<>(); // 申报数量统计 - 使用字符串状态值 diff --git a/backend/ruoyi-modules/ruoyi-cw/src/main/java/org/dromara/cw/controller/CwProjectApprovalController.java b/backend/ruoyi-modules/ruoyi-cw/src/main/java/org/dromara/cw/controller/CwProjectApprovalController.java index 894a6c27..eb0525d1 100644 --- a/backend/ruoyi-modules/ruoyi-cw/src/main/java/org/dromara/cw/controller/CwProjectApprovalController.java +++ b/backend/ruoyi-modules/ruoyi-cw/src/main/java/org/dromara/cw/controller/CwProjectApprovalController.java @@ -93,7 +93,7 @@ public class CwProjectApprovalController extends BaseController { //@SaCheckPermission("cw:projectApproval:query") @GetMapping("/{id}") public R getInfo(@NotNull(message = "主键不能为空") - @PathVariable Long id) { + @PathVariable("id") Long id) { return R.ok(projectApprovalService.getProcessDetail(id)); } @@ -102,7 +102,7 @@ public class CwProjectApprovalController extends BaseController { */ //@SaCheckPermission("cw:projectApproval:query") @GetMapping("/records/{applicationId}") - public R> getApprovalRecords(@PathVariable Long applicationId) { + public R> getApprovalRecords(@PathVariable("applicationId") Long applicationId) { return R.ok(projectApprovalService.getApprovalRecords(applicationId)); } @@ -113,7 +113,7 @@ public class CwProjectApprovalController extends BaseController { @Log(title = "终止审批流程", businessType = BusinessType.UPDATE) @DeleteMapping("/{ids}") public R terminate(@NotEmpty(message = "主键不能为空") - @PathVariable Long[] ids) { + @PathVariable("ids") Long[] ids) { return toAjax(projectApprovalService.terminateProcess(List.of(ids))); } diff --git a/backend/ruoyi-modules/ruoyi-cw/src/main/java/org/dromara/cw/controller/CwProjectAuditorController.java b/backend/ruoyi-modules/ruoyi-cw/src/main/java/org/dromara/cw/controller/CwProjectAuditorController.java index a1765c5e..0625d010 100644 --- a/backend/ruoyi-modules/ruoyi-cw/src/main/java/org/dromara/cw/controller/CwProjectAuditorController.java +++ b/backend/ruoyi-modules/ruoyi-cw/src/main/java/org/dromara/cw/controller/CwProjectAuditorController.java @@ -63,7 +63,7 @@ public class CwProjectAuditorController extends BaseController { //@SaCheckPermission("cw:projectAuditor:query") @GetMapping("/{id}") public R getInfo(@NotNull(message = "主键不能为空") - @PathVariable Long id) { + @PathVariable("id") Long id) { return R.ok(cwProjectAuditorService.queryById(id)); } @@ -99,7 +99,7 @@ public class CwProjectAuditorController extends BaseController { @Log(title = "项目审核人配置", businessType = BusinessType.DELETE) @DeleteMapping("/{ids}") public R remove(@NotEmpty(message = "主键不能为空") - @PathVariable Long[] ids) { + @PathVariable("ids") Long[] ids) { return toAjax(cwProjectAuditorService.deleteWithValidByIds(List.of(ids), true)); } @@ -133,7 +133,7 @@ public class CwProjectAuditorController extends BaseController { */ //@SaCheckPermission("cw:projectAuditor:list") @GetMapping("/deptUsers/{deptId}") - public R> getDeptUsers(@PathVariable Long deptId) { + public R> getDeptUsers(@PathVariable("deptId") Long deptId) { // 参数验证 if (deptId == null || deptId <= 0) { return R.fail("部门ID参数无效"); @@ -177,7 +177,7 @@ public class CwProjectAuditorController extends BaseController { //@SaCheckPermission("cw:projectAuditor:edit") @Log(title = "批量启用审核人", businessType = BusinessType.UPDATE) @PutMapping("/enable/{ids}") - public R enable(@PathVariable Long[] ids) { + public R enable(@PathVariable("ids") Long[] ids) { return toAjax(cwProjectAuditorService.updateStatus(List.of(ids), "1")); } @@ -187,7 +187,7 @@ public class CwProjectAuditorController extends BaseController { //@SaCheckPermission("cw:projectAuditor:edit") @Log(title = "批量停用审核人", businessType = BusinessType.UPDATE) @PutMapping("/disable/{ids}") - public R disable(@PathVariable Long[] ids) { + public R disable(@PathVariable("ids") Long[] ids) { return toAjax(cwProjectAuditorService.updateStatus(List.of(ids), "0")); } diff --git a/backend/ruoyi-modules/ruoyi-cw/src/main/java/org/dromara/cw/controller/CwProjectEvaluationIndicatorController.java b/backend/ruoyi-modules/ruoyi-cw/src/main/java/org/dromara/cw/controller/CwProjectEvaluationIndicatorController.java index 63d90c03..1aad4bd5 100644 --- a/backend/ruoyi-modules/ruoyi-cw/src/main/java/org/dromara/cw/controller/CwProjectEvaluationIndicatorController.java +++ b/backend/ruoyi-modules/ruoyi-cw/src/main/java/org/dromara/cw/controller/CwProjectEvaluationIndicatorController.java @@ -51,7 +51,7 @@ public class CwProjectEvaluationIndicatorController extends BaseController { */ //@SaCheckPermission("cw:indicator:query") @GetMapping("/{id}") - public R getInfo(@NotNull(message = "主键不能为空") @PathVariable Long id) { + public R getInfo(@NotNull(message = "主键不能为空") @PathVariable("id") Long id) { return R.ok(indicatorService.queryById(id)); } @@ -60,7 +60,7 @@ public class CwProjectEvaluationIndicatorController extends BaseController { */ //@SaCheckPermission("cw:indicator:query") @GetMapping("/evaluation/{evaluationId}") - public R> getByEvaluationId(@NotNull(message = "自评ID不能为空") @PathVariable Long evaluationId) { + public R> getByEvaluationId(@NotNull(message = "自评ID不能为空") @PathVariable("evaluationId") Long evaluationId) { return R.ok(indicatorService.queryByEvaluationId(evaluationId)); } @@ -70,8 +70,8 @@ public class CwProjectEvaluationIndicatorController extends BaseController { //@SaCheckPermission("cw:indicator:query") @GetMapping("/evaluation/{evaluationId}/type/{indicatorType}") public R> getByEvaluationIdAndType( - @NotNull(message = "自评ID不能为空") @PathVariable Long evaluationId, - @NotBlank(message = "指标类型不能为空") @PathVariable String indicatorType) { + @NotNull(message = "自评ID不能为空") @PathVariable("evaluationId") Long evaluationId, + @NotBlank(message = "指标类型不能为空") @PathVariable("indicatorType") String indicatorType) { return R.ok(indicatorService.queryByEvaluationIdAndType(evaluationId, indicatorType)); } @@ -104,7 +104,7 @@ public class CwProjectEvaluationIndicatorController extends BaseController { @Log(title = "批量保存指标明细", businessType = BusinessType.UPDATE) @RepeatSubmit() @PostMapping("/batch") - public R batchSave(@RequestParam Long evaluationId, @RequestBody List boList) { + public R batchSave(@RequestParam("evaluationId") Long evaluationId, @RequestBody List boList) { return toAjax(indicatorService.batchSave(evaluationId, boList)); } @@ -114,7 +114,7 @@ public class CwProjectEvaluationIndicatorController extends BaseController { //@SaCheckPermission("cw:indicator:remove") @Log(title = "项目绩效自评指标明细", businessType = BusinessType.DELETE) @DeleteMapping("/{ids}") - public R remove(@NotEmpty(message = "主键不能为空") @PathVariable Long[] ids) { + public R remove(@NotEmpty(message = "主键不能为空") @PathVariable("ids") Long[] ids) { return toAjax(indicatorService.deleteWithValidByIds(Arrays.asList(ids), true)); } diff --git a/backend/ruoyi-modules/ruoyi-cw/src/main/java/org/dromara/cw/controller/CwProjectMonthlyMonitoringController.java b/backend/ruoyi-modules/ruoyi-cw/src/main/java/org/dromara/cw/controller/CwProjectMonthlyMonitoringController.java index 33229f74..33ec728c 100644 --- a/backend/ruoyi-modules/ruoyi-cw/src/main/java/org/dromara/cw/controller/CwProjectMonthlyMonitoringController.java +++ b/backend/ruoyi-modules/ruoyi-cw/src/main/java/org/dromara/cw/controller/CwProjectMonthlyMonitoringController.java @@ -52,7 +52,7 @@ public class CwProjectMonthlyMonitoringController extends BaseController { */ //@SaCheckPermission("cw:monitoring:query") @GetMapping("/{id}") - public R getInfo(@NotNull(message = "主键不能为空") @PathVariable Long id) { + public R getInfo(@NotNull(message = "主键不能为空") @PathVariable("id") Long id) { return R.ok(monitoringService.queryById(id)); } @@ -61,7 +61,7 @@ public class CwProjectMonthlyMonitoringController extends BaseController { */ //@SaCheckPermission("cw:monitoring:query") @GetMapping("/evaluation/{evaluationId}") - public R> getByEvaluationId(@NotNull(message = "自评ID不能为空") @PathVariable Long evaluationId) { + public R> getByEvaluationId(@NotNull(message = "自评ID不能为空") @PathVariable("evaluationId") Long evaluationId) { return R.ok(monitoringService.queryByEvaluationId(evaluationId)); } @@ -71,8 +71,8 @@ public class CwProjectMonthlyMonitoringController extends BaseController { //@SaCheckPermission("cw:monitoring:query") @GetMapping("/year/{evaluationId}/{year}") public R> getYearlyMonitoring( - @NotNull(message = "自评ID不能为空") @PathVariable Long evaluationId, - @NotNull(message = "年份不能为空") @PathVariable Integer year) { + @NotNull(message = "自评ID不能为空") @PathVariable("evaluationId") Long evaluationId, + @NotNull(message = "年份不能为空") @PathVariable("year") Integer year) { return R.ok(monitoringService.queryYearlyMonitoring(evaluationId, year)); } @@ -116,7 +116,7 @@ public class CwProjectMonthlyMonitoringController extends BaseController { @Log(title = "批量保存月度监控数据", businessType = BusinessType.UPDATE) @RepeatSubmit() @PostMapping("/batch") - public R batchSave(@RequestParam Long evaluationId, @RequestBody List boList) { + public R batchSave(@RequestParam("evaluationId") Long evaluationId, @RequestBody List boList) { return toAjax(monitoringService.batchSave(evaluationId, boList)); } @@ -126,7 +126,7 @@ public class CwProjectMonthlyMonitoringController extends BaseController { //@SaCheckPermission("cw:monitoring:remove") @Log(title = "项目月度运行监控", businessType = BusinessType.DELETE) @DeleteMapping("/{ids}") - public R remove(@NotEmpty(message = "主键不能为空") @PathVariable Long[] ids) { + public R remove(@NotEmpty(message = "主键不能为空") @PathVariable("ids") Long[] ids) { return toAjax(monitoringService.deleteWithValidByIds(Arrays.asList(ids), true)); } diff --git a/backend/ruoyi-modules/ruoyi-cw/src/main/java/org/dromara/cw/controller/CwProjectPerformanceSelfEvaluationController.java b/backend/ruoyi-modules/ruoyi-cw/src/main/java/org/dromara/cw/controller/CwProjectPerformanceSelfEvaluationController.java index ed0951c0..17596fd5 100644 --- a/backend/ruoyi-modules/ruoyi-cw/src/main/java/org/dromara/cw/controller/CwProjectPerformanceSelfEvaluationController.java +++ b/backend/ruoyi-modules/ruoyi-cw/src/main/java/org/dromara/cw/controller/CwProjectPerformanceSelfEvaluationController.java @@ -54,7 +54,7 @@ public class CwProjectPerformanceSelfEvaluationController extends BaseController */ //@SaCheckPermission("cw:evaluation:query") @GetMapping("/{id}") - public R getInfo(@NotNull(message = "主键不能为空") @PathVariable Long id) { + public R getInfo(@NotNull(message = "主键不能为空") @PathVariable("id") Long id) { return R.ok(evaluationService.queryById(id)); } @@ -102,7 +102,7 @@ public class CwProjectPerformanceSelfEvaluationController extends BaseController @Log(title = "提交自评", businessType = BusinessType.UPDATE) @RepeatSubmit() @PostMapping("/submit/{id}") - public R submit(@NotNull(message = "主键不能为空") @PathVariable Long id) { + public R submit(@NotNull(message = "主键不能为空") @PathVariable("id") Long id) { return toAjax(evaluationService.submitEvaluation(id)); } @@ -113,9 +113,9 @@ public class CwProjectPerformanceSelfEvaluationController extends BaseController @Log(title = "审核自评", businessType = BusinessType.UPDATE) @RepeatSubmit() @PostMapping("/approve/{id}") - public R approve(@NotNull(message = "主键不能为空") @PathVariable Long id, - @RequestParam String opinion, - @RequestParam Boolean approved) { + public R approve(@NotNull(message = "主键不能为空") @PathVariable("id") Long id, + @RequestParam("opinion") String opinion, + @RequestParam("approved") Boolean approved) { return toAjax(evaluationService.approveEvaluation(id, opinion, approved)); } @@ -125,7 +125,7 @@ public class CwProjectPerformanceSelfEvaluationController extends BaseController //@SaCheckPermission("cw:evaluation:remove") @Log(title = "项目绩效自评", businessType = BusinessType.DELETE) @DeleteMapping("/{ids}") - public R remove(@NotEmpty(message = "主键不能为空") @PathVariable Long[] ids) { + public R remove(@NotEmpty(message = "主键不能为空") @PathVariable("ids") Long[] ids) { return toAjax(evaluationService.deleteWithValidByIds(Arrays.asList(ids), true)); } diff --git a/backend/ruoyi-modules/ruoyi-demo/src/main/java/org/dromara/demo/controller/TestDemoController.java b/backend/ruoyi-modules/ruoyi-demo/src/main/java/org/dromara/demo/controller/TestDemoController.java index 47d89511..1193bd5a 100644 --- a/backend/ruoyi-modules/ruoyi-demo/src/main/java/org/dromara/demo/controller/TestDemoController.java +++ b/backend/ruoyi-modules/ruoyi-demo/src/main/java/org/dromara/demo/controller/TestDemoController.java @@ -141,7 +141,7 @@ public class TestDemoController extends BaseController { @Log(title = "测试单表", businessType = BusinessType.DELETE) @DeleteMapping("/{ids}") public R remove(@NotEmpty(message = "主键不能为空") - @PathVariable Long[] ids) { + @PathVariable("ids") Long[] ids) { return toAjax(testDemoService.deleteWithValidByIds(Arrays.asList(ids), true)); } } diff --git a/backend/ruoyi-modules/ruoyi-demo/src/main/java/org/dromara/demo/controller/TestTreeController.java b/backend/ruoyi-modules/ruoyi-demo/src/main/java/org/dromara/demo/controller/TestTreeController.java index 41a983ef..4484dded 100644 --- a/backend/ruoyi-modules/ruoyi-demo/src/main/java/org/dromara/demo/controller/TestTreeController.java +++ b/backend/ruoyi-modules/ruoyi-demo/src/main/java/org/dromara/demo/controller/TestTreeController.java @@ -101,7 +101,7 @@ public class TestTreeController extends BaseController { @Log(title = "测试树表", businessType = BusinessType.DELETE) @DeleteMapping("/{ids}") public R remove(@NotEmpty(message = "主键不能为空") - @PathVariable Long[] ids) { + @PathVariable("ids") Long[] ids) { return toAjax(testTreeService.deleteWithValidByIds(Arrays.asList(ids), true)); } } diff --git a/backend/ruoyi-modules/ruoyi-generator/src/main/java/org/dromara/generator/controller/GenController.java b/backend/ruoyi-modules/ruoyi-generator/src/main/java/org/dromara/generator/controller/GenController.java index e3d4c087..428bb930 100644 --- a/backend/ruoyi-modules/ruoyi-generator/src/main/java/org/dromara/generator/controller/GenController.java +++ b/backend/ruoyi-modules/ruoyi-generator/src/main/java/org/dromara/generator/controller/GenController.java @@ -52,7 +52,7 @@ public class GenController extends BaseController { */ @SaCheckPermission("tool:gen:query") @GetMapping(value = "/{tableId}") - public R> getInfo(@PathVariable Long tableId) { + public R> getInfo(@PathVariable("tableId") Long tableId) { GenTable table = genTableService.selectGenTableById(tableId); List tables = genTableService.selectGenTableAll(); List list = genTableService.selectGenTableColumnListByTableId(tableId); @@ -123,7 +123,7 @@ public class GenController extends BaseController { @SaCheckPermission("tool:gen:remove") @Log(title = "代码生成", businessType = BusinessType.DELETE) @DeleteMapping("/{tableIds}") - public R remove(@PathVariable Long[] tableIds) { + public R remove(@PathVariable("tableIds") Long[] tableIds) { genTableService.deleteGenTableByIds(tableIds); return R.ok(); } diff --git a/backend/ruoyi-modules/ruoyi-hq/src/main/java/org/dromara/hq/controller/HqHallInfoController.java b/backend/ruoyi-modules/ruoyi-hq/src/main/java/org/dromara/hq/controller/HqHallInfoController.java index 27cd8b0b..fa002351 100644 --- a/backend/ruoyi-modules/ruoyi-hq/src/main/java/org/dromara/hq/controller/HqHallInfoController.java +++ b/backend/ruoyi-modules/ruoyi-hq/src/main/java/org/dromara/hq/controller/HqHallInfoController.java @@ -67,7 +67,7 @@ public class HqHallInfoController extends BaseController { @ApiEncrypt(response = true) //@SaCheckPermission("hq:hallInfo:query") @GetMapping("/{id}") - public R getInfo(@NotNull(message = "主键不能为空") @PathVariable Long id) { + public R getInfo(@NotNull(message = "主键不能为空") @PathVariable("id") Long id) { return R.ok(hqHallInfoService.queryById(id)); } @@ -104,7 +104,7 @@ public class HqHallInfoController extends BaseController { //@SaCheckPermission("hq:hallInfo:remove") @Log(title = "报告厅信息", businessType = BusinessType.DELETE) @DeleteMapping("/{ids}") - public R remove(@NotEmpty(message = "主键不能为空") @PathVariable Long[] ids) { + public R remove(@NotEmpty(message = "主键不能为空") @PathVariable("ids") Long[] ids) { return toAjax(hqHallInfoService.deleteWithValidByIds(List.of(ids), true)); } } diff --git a/backend/ruoyi-modules/ruoyi-hq/src/main/java/org/dromara/hq/controller/HqHallReservationController.java b/backend/ruoyi-modules/ruoyi-hq/src/main/java/org/dromara/hq/controller/HqHallReservationController.java index 6c01ce1b..64e9594b 100644 --- a/backend/ruoyi-modules/ruoyi-hq/src/main/java/org/dromara/hq/controller/HqHallReservationController.java +++ b/backend/ruoyi-modules/ruoyi-hq/src/main/java/org/dromara/hq/controller/HqHallReservationController.java @@ -70,7 +70,7 @@ public class HqHallReservationController extends BaseController { @ApiEncrypt(response = true) //@SaCheckPermission("hq:hallReservation:query") @GetMapping("/{id}") - public R getInfo(@NotNull(message = "主键不能为空") @PathVariable Long id) { + public R getInfo(@NotNull(message = "主键不能为空") @PathVariable("id") Long id) { return R.ok(hqHallReservationService.queryById(id)); } @@ -107,7 +107,7 @@ public class HqHallReservationController extends BaseController { //@SaCheckPermission("hq:hallReservation:remove") @Log(title = "报告厅预约", businessType = BusinessType.DELETE) @DeleteMapping("/{ids}") - public R remove(@NotEmpty(message = "主键不能为空") @PathVariable Long[] ids) { + public R remove(@NotEmpty(message = "主键不能为空") @PathVariable("ids") Long[] ids) { return toAjax(hqHallReservationService.deleteWithValidByIds(List.of(ids), true)); } diff --git a/backend/ruoyi-modules/ruoyi-hq/src/main/java/org/dromara/hq/controller/HqPmRepairAttachmentController.java b/backend/ruoyi-modules/ruoyi-hq/src/main/java/org/dromara/hq/controller/HqPmRepairAttachmentController.java index 328923e2..1d05cc01 100644 --- a/backend/ruoyi-modules/ruoyi-hq/src/main/java/org/dromara/hq/controller/HqPmRepairAttachmentController.java +++ b/backend/ruoyi-modules/ruoyi-hq/src/main/java/org/dromara/hq/controller/HqPmRepairAttachmentController.java @@ -63,7 +63,7 @@ public class HqPmRepairAttachmentController extends BaseController { */ //@SaCheckPermission("pm:attachment:query") @GetMapping("/{id}") - public R getInfo(@NotNull(message = "主键不能为空") @PathVariable Long id) { + public R getInfo(@NotNull(message = "主键不能为空") @PathVariable("id") Long id) { return R.ok(attachmentService.queryById(id)); } @@ -96,7 +96,7 @@ public class HqPmRepairAttachmentController extends BaseController { //@SaCheckPermission("pm:attachment:remove") @Log(title = "报修附件", businessType = BusinessType.DELETE) @DeleteMapping("/{ids}") - public R remove(@NotEmpty(message = "主键不能为空") @PathVariable Long[] ids) { + public R remove(@NotEmpty(message = "主键不能为空") @PathVariable("ids") Long[] ids) { return toAjax(attachmentService.deleteWithValidByIds(List.of(ids), true)); } diff --git a/backend/ruoyi-modules/ruoyi-hq/src/main/java/org/dromara/hq/controller/HqPmRepairCategoryController.java b/backend/ruoyi-modules/ruoyi-hq/src/main/java/org/dromara/hq/controller/HqPmRepairCategoryController.java index 0ce885a5..69795519 100644 --- a/backend/ruoyi-modules/ruoyi-hq/src/main/java/org/dromara/hq/controller/HqPmRepairCategoryController.java +++ b/backend/ruoyi-modules/ruoyi-hq/src/main/java/org/dromara/hq/controller/HqPmRepairCategoryController.java @@ -61,7 +61,7 @@ public class HqPmRepairCategoryController extends BaseController { */ //@SaCheckPermission("pm:category:query") @GetMapping("/{id}") - public R getInfo(@NotNull(message = "主键不能为空") @PathVariable Long id) { + public R getInfo(@NotNull(message = "主键不能为空") @PathVariable("id") Long id) { return R.ok(repairCategoryService.queryById(id)); } @@ -93,7 +93,7 @@ public class HqPmRepairCategoryController extends BaseController { //@SaCheckPermission("pm:category:remove") @Log(title = "维修类型", businessType = BusinessType.DELETE) @DeleteMapping("/{ids}") - public R remove(@NotEmpty(message = "主键不能为空") @PathVariable Long[] ids) { + public R remove(@NotEmpty(message = "主键不能为空") @PathVariable("ids") Long[] ids) { return toAjax(repairCategoryService.deleteWithValidByIds(List.of(ids), true)); } diff --git a/backend/ruoyi-modules/ruoyi-hq/src/main/java/org/dromara/hq/controller/HqPmRepairOrderController.java b/backend/ruoyi-modules/ruoyi-hq/src/main/java/org/dromara/hq/controller/HqPmRepairOrderController.java index 9619efd7..b3d6cc48 100644 --- a/backend/ruoyi-modules/ruoyi-hq/src/main/java/org/dromara/hq/controller/HqPmRepairOrderController.java +++ b/backend/ruoyi-modules/ruoyi-hq/src/main/java/org/dromara/hq/controller/HqPmRepairOrderController.java @@ -65,7 +65,7 @@ public class HqPmRepairOrderController extends BaseController { */ //@SaCheckPermission("pm:repairOrder:query") @GetMapping("/{id}") - public R getInfo(@NotNull(message = "主键不能为空") @PathVariable Long id) { + public R getInfo(@NotNull(message = "主键不能为空") @PathVariable("id") Long id) { return R.ok(repairOrderService.queryById(id)); } @@ -103,7 +103,7 @@ public class HqPmRepairOrderController extends BaseController { //@SaCheckPermission("pm:repairOrder:remove") @Log(title = "报修工单", businessType = BusinessType.DELETE) @DeleteMapping("/{ids}") - public R remove(@NotEmpty(message = "主键不能为空") @PathVariable Long[] ids) { + public R remove(@NotEmpty(message = "主键不能为空") @PathVariable("ids") Long[] ids) { return toAjax(repairOrderService.deleteWithValidByIds(List.of(ids), true)); } @@ -115,9 +115,9 @@ public class HqPmRepairOrderController extends BaseController { @RepeatSubmit() @PutMapping("/{orderId}/assign") public R assignOrder( - @NotNull(message = "工单ID不能为空") @PathVariable Long orderId, - @NotNull(message = "维修员ID不能为空") @RequestParam Long assigneeId, - @RequestParam(required = false) String assignRemark) { + @NotNull(message = "工单ID不能为空") @PathVariable("orderId") Long orderId, + @NotNull(message = "维修员ID不能为空") @RequestParam("assigneeId") Long assigneeId, + @RequestParam(value = "assignRemark", required = false) String assignRemark) { return toAjax(repairOrderService.assignOrder(orderId, assigneeId, assignRemark)); } @@ -128,7 +128,7 @@ public class HqPmRepairOrderController extends BaseController { @Log(title = "开始维修", businessType = BusinessType.UPDATE) @RepeatSubmit() @PutMapping("/{orderId}/start") - public R startRepair(@NotNull(message = "工单ID不能为空") @PathVariable Long orderId) { + public R startRepair(@NotNull(message = "工单ID不能为空") @PathVariable("orderId") Long orderId) { return toAjax(repairOrderService.startRepair(orderId)); } @@ -140,9 +140,9 @@ public class HqPmRepairOrderController extends BaseController { @RepeatSubmit() @PutMapping("/{orderId}/finish") public R finishRepair( - @NotNull(message = "工单ID不能为空") @PathVariable Long orderId, - @RequestParam(required = false) String repairResult, - @RequestParam(required = false) String usedMaterials) { + @NotNull(message = "工单ID不能为空") @PathVariable("orderId") Long orderId, + @RequestParam(value = "repairResult", required = false) String repairResult, + @RequestParam(value = "usedMaterials", required = false) String usedMaterials) { return toAjax(repairOrderService.finishRepair(orderId, repairResult, usedMaterials)); } @@ -154,8 +154,8 @@ public class HqPmRepairOrderController extends BaseController { @RepeatSubmit() @PutMapping("/{orderId}/cancel") public R cancelOrder( - @NotNull(message = "工单ID不能为空") @PathVariable Long orderId, - @RequestParam(required = false) String cancelReason) { + @NotNull(message = "工单ID不能为空") @PathVariable("orderId") Long orderId, + @RequestParam(value = "cancelReason", required = false) String cancelReason) { return toAjax(repairOrderService.cancelOrder(orderId, cancelReason)); } @@ -259,7 +259,7 @@ public class HqPmRepairOrderController extends BaseController { //@SaCheckPermission("pm:repairOrder:progress") @GetMapping("/{orderId}/progress") public R>> getRepairProgress( - @NotNull(message = "工单ID不能为空") @PathVariable Long orderId) { + @NotNull(message = "工单ID不能为空") @PathVariable("orderId") Long orderId) { List> progressList = repairOrderService.getRepairProgress(orderId); return R.ok(progressList); } @@ -284,7 +284,7 @@ public class HqPmRepairOrderController extends BaseController { @RepeatSubmit() @PutMapping("/{orderId}/complete") public R completeOrder( - @NotNull(message = "工单ID不能为空") @PathVariable Long orderId, + @NotNull(message = "工单ID不能为空") @PathVariable("orderId") Long orderId, @RequestBody java.util.Map completeData) { String repairResult = (String) completeData.get("repairResult"); String usedMaterials = (String) completeData.get("usedMaterials"); @@ -312,7 +312,7 @@ public class HqPmRepairOrderController extends BaseController { //@SaCheckPermission("pm:repairOrder:query") @GetMapping("/{orderId}/evaluation") public R> getServiceEvaluation( - @NotNull(message = "工单ID不能为空") @PathVariable Long orderId) { + @NotNull(message = "工单ID不能为空") @PathVariable("orderId") Long orderId) { // 从service获取真实评价数据 java.util.Map evaluation = repairOrderService.getServiceEvaluation(orderId); return R.ok(evaluation); @@ -324,7 +324,7 @@ public class HqPmRepairOrderController extends BaseController { //@SaCheckPermission("pm:repairOrder:query") @GetMapping("/{orderId}/attachments") public R> getRepairAttachments( - @NotNull(message = "工单ID不能为空") @PathVariable Long orderId) { + @NotNull(message = "工单ID不能为空") @PathVariable("orderId") Long orderId) { List attachments = attachmentService.queryByOrderId(orderId); return R.ok(attachments); } diff --git a/backend/ruoyi-modules/ruoyi-hq/src/main/java/org/dromara/hq/controller/HqSatCategoryController.java b/backend/ruoyi-modules/ruoyi-hq/src/main/java/org/dromara/hq/controller/HqSatCategoryController.java index 9e219caf..b5ab9e6a 100644 --- a/backend/ruoyi-modules/ruoyi-hq/src/main/java/org/dromara/hq/controller/HqSatCategoryController.java +++ b/backend/ruoyi-modules/ruoyi-hq/src/main/java/org/dromara/hq/controller/HqSatCategoryController.java @@ -74,7 +74,7 @@ public class HqSatCategoryController extends BaseController { //@SaCheckPermission("hq:satCategory:query") @GetMapping("/{id}") public R getInfo(@NotNull(message = "主键不能为空") - @PathVariable Long id) { + @PathVariable("id") Long id) { return R.ok(hqSatCategoryService.queryById(id)); } @@ -109,7 +109,7 @@ public class HqSatCategoryController extends BaseController { @Log(title = "题目分类", businessType = BusinessType.DELETE) @DeleteMapping("/{ids}") public R remove(@NotEmpty(message = "主键不能为空") - @PathVariable Long[] ids) { + @PathVariable("ids") Long[] ids) { return toAjax(hqSatCategoryService.deleteWithValidByIds(List.of(ids), true)); } } diff --git a/backend/ruoyi-modules/ruoyi-hq/src/main/java/org/dromara/hq/controller/HqSatDetailController.java b/backend/ruoyi-modules/ruoyi-hq/src/main/java/org/dromara/hq/controller/HqSatDetailController.java index 0e916fcb..512f301d 100644 --- a/backend/ruoyi-modules/ruoyi-hq/src/main/java/org/dromara/hq/controller/HqSatDetailController.java +++ b/backend/ruoyi-modules/ruoyi-hq/src/main/java/org/dromara/hq/controller/HqSatDetailController.java @@ -64,7 +64,7 @@ public class HqSatDetailController extends BaseController { //@SaCheckPermission("hq:satDetail:query") @GetMapping("/{id}") public R getInfo(@NotNull(message = "主键不能为空") - @PathVariable Long id) { + @PathVariable("id") Long id) { return R.ok(hqSatDetailService.queryById(id)); } @@ -99,7 +99,7 @@ public class HqSatDetailController extends BaseController { @Log(title = "答题详情", businessType = BusinessType.DELETE) @DeleteMapping("/{ids}") public R remove(@NotEmpty(message = "主键不能为空") - @PathVariable Long[] ids) { + @PathVariable("ids") Long[] ids) { return toAjax(hqSatDetailService.deleteWithValidByIds(List.of(ids), true)); } } diff --git a/backend/ruoyi-modules/ruoyi-hq/src/main/java/org/dromara/hq/controller/HqSatOptionController.java b/backend/ruoyi-modules/ruoyi-hq/src/main/java/org/dromara/hq/controller/HqSatOptionController.java index 6f8fbce3..e0aba9c2 100644 --- a/backend/ruoyi-modules/ruoyi-hq/src/main/java/org/dromara/hq/controller/HqSatOptionController.java +++ b/backend/ruoyi-modules/ruoyi-hq/src/main/java/org/dromara/hq/controller/HqSatOptionController.java @@ -64,7 +64,7 @@ public class HqSatOptionController extends BaseController { //@SaCheckPermission("hq:satOption:query") @GetMapping("/{id}") public R getInfo(@NotNull(message = "主键不能为空") - @PathVariable Long id) { + @PathVariable("id") Long id) { return R.ok(hqSatOptionService.queryById(id)); } @@ -99,7 +99,7 @@ public class HqSatOptionController extends BaseController { @Log(title = "评分选项", businessType = BusinessType.DELETE) @DeleteMapping("/{ids}") public R remove(@NotEmpty(message = "主键不能为空") - @PathVariable Long[] ids) { + @PathVariable("ids") Long[] ids) { return toAjax(hqSatOptionService.deleteWithValidByIds(List.of(ids), true)); } } diff --git a/backend/ruoyi-modules/ruoyi-hq/src/main/java/org/dromara/hq/controller/HqSatQuestionController.java b/backend/ruoyi-modules/ruoyi-hq/src/main/java/org/dromara/hq/controller/HqSatQuestionController.java index 539afee9..0203a5da 100644 --- a/backend/ruoyi-modules/ruoyi-hq/src/main/java/org/dromara/hq/controller/HqSatQuestionController.java +++ b/backend/ruoyi-modules/ruoyi-hq/src/main/java/org/dromara/hq/controller/HqSatQuestionController.java @@ -67,7 +67,7 @@ public class HqSatQuestionController extends BaseController { */ //@SaCheckPermission("hq:satQuestion:query") @GetMapping("/{id}") - public R getInfo(@NotNull(message = "主键不能为空") @PathVariable Long id) { + public R getInfo(@NotNull(message = "主键不能为空") @PathVariable("id") Long id) { return R.ok(hqSatQuestionService.queryById(id)); } @@ -101,7 +101,7 @@ public class HqSatQuestionController extends BaseController { //@SaCheckPermission("hq:satQuestion:remove") @Log(title = "题库", businessType = BusinessType.DELETE) @DeleteMapping("/{ids}") - public R remove(@NotEmpty(message = "主键不能为空") @PathVariable Long[] ids) { + public R remove(@NotEmpty(message = "主键不能为空") @PathVariable("ids") Long[] ids) { return toAjax(hqSatQuestionService.deleteWithValidByIds(List.of(ids), true)); } @@ -112,7 +112,7 @@ public class HqSatQuestionController extends BaseController { */ //@SaCheckPermission("hq:satQuestion:query") @GetMapping("/{questionId}/options") - public R> getQuestionOptions(@PathVariable Long questionId) { + public R> getQuestionOptions(@PathVariable("questionId") Long questionId) { // 根据题目ID获取该题目的选项 HqSatOptionBo bo = new HqSatOptionBo(); bo.setQuestionId(questionId); // 使用questionId进行过滤 diff --git a/backend/ruoyi-modules/ruoyi-hq/src/main/java/org/dromara/hq/controller/HqSatRecordController.java b/backend/ruoyi-modules/ruoyi-hq/src/main/java/org/dromara/hq/controller/HqSatRecordController.java index 060317d3..13747089 100644 --- a/backend/ruoyi-modules/ruoyi-hq/src/main/java/org/dromara/hq/controller/HqSatRecordController.java +++ b/backend/ruoyi-modules/ruoyi-hq/src/main/java/org/dromara/hq/controller/HqSatRecordController.java @@ -64,7 +64,7 @@ public class HqSatRecordController extends BaseController { //@SaCheckPermission("hq:satRecord:query") @GetMapping("/{id}") public R getInfo(@NotNull(message = "主键不能为空") - @PathVariable Long id) { + @PathVariable("id") Long id) { return R.ok(hqSatRecordService.queryById(id)); } @@ -99,7 +99,7 @@ public class HqSatRecordController extends BaseController { @Log(title = "答题记录", businessType = BusinessType.DELETE) @DeleteMapping("/{ids}") public R remove(@NotEmpty(message = "主键不能为空") - @PathVariable Long[] ids) { + @PathVariable("ids") Long[] ids) { return toAjax(hqSatRecordService.deleteWithValidByIds(List.of(ids), true)); } } diff --git a/backend/ruoyi-modules/ruoyi-hq/src/main/java/org/dromara/hq/controller/HqSatSurveyController.java b/backend/ruoyi-modules/ruoyi-hq/src/main/java/org/dromara/hq/controller/HqSatSurveyController.java index 97c59863..50a01b91 100644 --- a/backend/ruoyi-modules/ruoyi-hq/src/main/java/org/dromara/hq/controller/HqSatSurveyController.java +++ b/backend/ruoyi-modules/ruoyi-hq/src/main/java/org/dromara/hq/controller/HqSatSurveyController.java @@ -92,7 +92,7 @@ public class HqSatSurveyController extends BaseController { */ //@SaCheckPermission("hq:satSurvey:query") @GetMapping("/{id}") - public R getInfo(@NotNull(message = "主键不能为空") @PathVariable Long id) { + public R getInfo(@NotNull(message = "主键不能为空") @PathVariable("id") Long id) { return R.ok(hqSatSurveyService.queryById(id)); } @@ -126,7 +126,7 @@ public class HqSatSurveyController extends BaseController { //@SaCheckPermission("hq:satSurvey:remove") @Log(title = "问卷", businessType = BusinessType.DELETE) @DeleteMapping("/{ids}") - public R remove(@NotEmpty(message = "主键不能为空") @PathVariable Long[] ids) { + public R remove(@NotEmpty(message = "主键不能为空") @PathVariable("ids") Long[] ids) { return toAjax(hqSatSurveyService.deleteWithValidByIds(List.of(ids), true)); } @@ -138,7 +138,7 @@ public class HqSatSurveyController extends BaseController { //@SaCheckPermission("hq:satSurvey:question") @GetMapping("/{surveyId}/questions") public R> getSurveyQuestions( - @NotNull(message = "问卷ID不能为空") @PathVariable Long surveyId) { + @NotNull(message = "问卷ID不能为空") @PathVariable("surveyId") Long surveyId) { return R.ok(hqSatSurveyService.getSurveyQuestions(surveyId)); } @@ -152,7 +152,7 @@ public class HqSatSurveyController extends BaseController { @Log(title = "问卷题目管理", businessType = BusinessType.UPDATE) @RepeatSubmit() @PutMapping("/{surveyId}/questions") - public R updateSurveyQuestions(@NotNull(message = "问卷ID不能为空") @PathVariable Long surveyId, + public R updateSurveyQuestions(@NotNull(message = "问卷ID不能为空") @PathVariable("surveyId") Long surveyId, @RequestBody List questions) { return toAjax(hqSatSurveyService.updateSurveyQuestions(surveyId, questions)); } @@ -166,7 +166,7 @@ public class HqSatSurveyController extends BaseController { @Log(title = "发布问卷", businessType = BusinessType.UPDATE) @RepeatSubmit() @PutMapping("/{id}/publish") - public R publishSurvey(@NotNull(message = "问卷ID不能为空") @PathVariable Long id) { + public R publishSurvey(@NotNull(message = "问卷ID不能为空") @PathVariable("id") Long id) { return toAjax(hqSatSurveyService.publishSurvey(id)); } @@ -179,7 +179,7 @@ public class HqSatSurveyController extends BaseController { @Log(title = "撤销发布问卷", businessType = BusinessType.UPDATE) @RepeatSubmit() @PutMapping("/{id}/unpublish") - public R unpublishSurvey(@NotNull(message = "问卷ID不能为空") @PathVariable Long id) { + public R unpublishSurvey(@NotNull(message = "问卷ID不能为空") @PathVariable("id") Long id) { return toAjax(hqSatSurveyService.unpublishSurvey(id)); } @@ -239,7 +239,7 @@ public class HqSatSurveyController extends BaseController { * @param surveyId 问卷ID */ @GetMapping("/{surveyId}/answered") - public R checkUserAnswered(@NotNull(message = "问卷ID不能为空") @PathVariable Long surveyId) { + public R checkUserAnswered(@NotNull(message = "问卷ID不能为空") @PathVariable("surveyId") Long surveyId) { return R.ok(hqSatSurveyService.checkUserAnswered(surveyId)); } @@ -249,7 +249,7 @@ public class HqSatSurveyController extends BaseController { * @param surveyId 问卷ID */ @GetMapping("/{surveyId}/answer") - public R getUserSurveyAnswer(@NotNull(message = "问卷ID不能为空") @PathVariable Long surveyId) { + public R getUserSurveyAnswer(@NotNull(message = "问卷ID不能为空") @PathVariable("surveyId") Long surveyId) { try { HqSatRecordVo recordVo = hqSatSurveyService.getUserSurveyAnswer(surveyId); @@ -400,7 +400,7 @@ public class HqSatSurveyController extends BaseController { */ //@SaCheckPermission("hq:satSurvey:result") @GetMapping("/{surveyId}/statistics") - public R> getSurveyStatistics(@NotNull(message = "问卷ID不能为空") @PathVariable Long surveyId) { + public R> getSurveyStatistics(@NotNull(message = "问卷ID不能为空") @PathVariable("surveyId") Long surveyId) { return R.ok(hqSatSurveyService.getSurveyStatistics(surveyId)); } @@ -417,10 +417,10 @@ public class HqSatSurveyController extends BaseController { //@SaCheckPermission("hq:satSurvey:result") @GetMapping("/{surveyId}/records") public R> getSurveyAnswerRecords( - @NotNull(message = "问卷ID不能为空") @PathVariable Long surveyId, - @RequestParam(required = false) String status, - @RequestParam(required = false) String userName, - @RequestParam(required = false) String[] dateRange, + @NotNull(message = "问卷ID不能为空") @PathVariable("surveyId") Long surveyId, + @RequestParam(value = "status", required = false) String status, + @RequestParam(value = "userName", required = false) String userName, + @RequestParam(value = "dateRange", required = false) String[] dateRange, @RequestParam(defaultValue = "1") int pageNum, @RequestParam(defaultValue = "10") int pageSize) { @@ -441,7 +441,7 @@ public class HqSatSurveyController extends BaseController { */ //@SaCheckPermission("hq:satSurvey:result") @GetMapping("/record/{recordId}") - public R> getAnswerRecordDetail(@NotNull(message = "记录ID不能为空") @PathVariable Long recordId) { + public R> getAnswerRecordDetail(@NotNull(message = "记录ID不能为空") @PathVariable("recordId") Long recordId) { return R.ok(hqSatSurveyService.getAnswerRecordDetail(recordId)); } @@ -453,7 +453,7 @@ public class HqSatSurveyController extends BaseController { //@SaCheckPermission("hq:satSurvey:export") @Log(title = "导出调查报告", businessType = BusinessType.EXPORT) @PostMapping("/{surveyId}/exportReport") - public void exportSurveyReport(@NotNull(message = "问卷ID不能为空") @PathVariable Long surveyId, HttpServletResponse response) { + public void exportSurveyReport(@NotNull(message = "问卷ID不能为空") @PathVariable("surveyId") Long surveyId, HttpServletResponse response) { hqSatSurveyService.exportSurveyReport(surveyId, response); } @@ -465,7 +465,7 @@ public class HqSatSurveyController extends BaseController { //@SaCheckPermission("hq:satSurvey:export") @Log(title = "导出原始数据", businessType = BusinessType.EXPORT) @PostMapping("/{surveyId}/exportRawData") - public void exportSurveyRawData(@NotNull(message = "问卷ID不能为空") @PathVariable Long surveyId, HttpServletResponse response) { + public void exportSurveyRawData(@NotNull(message = "问卷ID不能为空") @PathVariable("surveyId") Long surveyId, HttpServletResponse response) { hqSatSurveyService.exportSurveyRawData(surveyId, response); } } diff --git a/backend/ruoyi-modules/ruoyi-hq/src/main/java/org/dromara/hq/controller/HqSatSurveyQuestionController.java b/backend/ruoyi-modules/ruoyi-hq/src/main/java/org/dromara/hq/controller/HqSatSurveyQuestionController.java index 6410b445..c9575dd7 100644 --- a/backend/ruoyi-modules/ruoyi-hq/src/main/java/org/dromara/hq/controller/HqSatSurveyQuestionController.java +++ b/backend/ruoyi-modules/ruoyi-hq/src/main/java/org/dromara/hq/controller/HqSatSurveyQuestionController.java @@ -64,7 +64,7 @@ public class HqSatSurveyQuestionController extends BaseController { //@SaCheckPermission("hq:satSurveyQuestion:query") @GetMapping("/{id}") public R getInfo(@NotNull(message = "主键不能为空") - @PathVariable Long id) { + @PathVariable("id") Long id) { return R.ok(hqSatSurveyQuestionService.queryById(id)); } @@ -99,7 +99,7 @@ public class HqSatSurveyQuestionController extends BaseController { @Log(title = "问卷题目关联", businessType = BusinessType.DELETE) @DeleteMapping("/{ids}") public R remove(@NotEmpty(message = "主键不能为空") - @PathVariable Long[] ids) { + @PathVariable("ids") Long[] ids) { return toAjax(hqSatSurveyQuestionService.deleteWithValidByIds(List.of(ids), true)); } } diff --git a/backend/ruoyi-modules/ruoyi-hq/src/main/java/org/dromara/hq/controller/HqVenueInfoController.java b/backend/ruoyi-modules/ruoyi-hq/src/main/java/org/dromara/hq/controller/HqVenueInfoController.java index fb071654..30f5730b 100644 --- a/backend/ruoyi-modules/ruoyi-hq/src/main/java/org/dromara/hq/controller/HqVenueInfoController.java +++ b/backend/ruoyi-modules/ruoyi-hq/src/main/java/org/dromara/hq/controller/HqVenueInfoController.java @@ -61,7 +61,7 @@ public class HqVenueInfoController extends BaseController { */ //@SaCheckPermission("hq:venue:query") @GetMapping("/{id}") - public R getInfo(@NotNull(message = "主键不能为空") @PathVariable Long id) { + public R getInfo(@NotNull(message = "主键不能为空") @PathVariable("id") Long id) { return R.ok(venueInfoService.queryById(id)); } @@ -93,7 +93,7 @@ public class HqVenueInfoController extends BaseController { //@SaCheckPermission("hq:venue:remove") @Log(title = "场地信息", businessType = BusinessType.DELETE) @DeleteMapping("/{ids}") - public R remove(@NotEmpty(message = "主键不能为空") @PathVariable Long[] ids) { + public R remove(@NotEmpty(message = "主键不能为空") @PathVariable("ids") Long[] ids) { return toAjax(venueInfoService.deleteWithValidByIds(List.of(ids), true)); } @@ -102,7 +102,7 @@ public class HqVenueInfoController extends BaseController { */ //@SaCheckPermission("hq:venue:query") @GetMapping("/code/{venueCode}") - public R getByCode(@PathVariable String venueCode) { + public R getByCode(@PathVariable("venueCode") String venueCode) { return R.ok(venueInfoService.queryByVenueCode(venueCode)); } diff --git a/backend/ruoyi-modules/ruoyi-hq/src/main/java/org/dromara/hq/controller/HqVenueReservationController.java b/backend/ruoyi-modules/ruoyi-hq/src/main/java/org/dromara/hq/controller/HqVenueReservationController.java index 34f84af4..bd119d40 100644 --- a/backend/ruoyi-modules/ruoyi-hq/src/main/java/org/dromara/hq/controller/HqVenueReservationController.java +++ b/backend/ruoyi-modules/ruoyi-hq/src/main/java/org/dromara/hq/controller/HqVenueReservationController.java @@ -81,7 +81,7 @@ public class HqVenueReservationController extends BaseController { */ //@SaCheckPermission("hq:reservation:query") @GetMapping("/{id}") - public R getInfo(@NotNull(message = "主键不能为空") @PathVariable Long id) { + public R getInfo(@NotNull(message = "主键不能为空") @PathVariable("id") Long id) { return R.ok(reservationService.queryById(id)); } @@ -113,7 +113,7 @@ public class HqVenueReservationController extends BaseController { //@SaCheckPermission("hq:reservation:remove") @Log(title = "场地预约", businessType = BusinessType.DELETE) @DeleteMapping("/{ids}") - public R remove(@NotEmpty(message = "主键不能为空") @PathVariable Long[] ids) { + public R remove(@NotEmpty(message = "主键不能为空") @PathVariable("ids") Long[] ids) { return toAjax(reservationService.deleteWithValidByIds(List.of(ids), true)); } @@ -123,10 +123,10 @@ public class HqVenueReservationController extends BaseController { //@SaCheckPermission("hq:reservation:query") @GetMapping("/conflict") public R> checkTimeConflict( - @RequestParam Long venueId, - @RequestParam LocalDateTime startTime, - @RequestParam LocalDateTime endTime, - @RequestParam(required = false) Long excludeId) { + @RequestParam("venueId") Long venueId, + @RequestParam("startTime") LocalDateTime startTime, + @RequestParam("endTime") LocalDateTime endTime, + @RequestParam(value = "excludeId", required = false) Long excludeId) { List conflicts = reservationService.checkTimeConflict(venueId, startTime, endTime, excludeId); return R.ok(conflicts); } diff --git a/backend/ruoyi-modules/ruoyi-jcbt/src/main/java/org/dromara/jcbt/controller/JcbtPovertyApplicationController.java b/backend/ruoyi-modules/ruoyi-jcbt/src/main/java/org/dromara/jcbt/controller/JcbtPovertyApplicationController.java index 1852a632..31f70c3f 100644 --- a/backend/ruoyi-modules/ruoyi-jcbt/src/main/java/org/dromara/jcbt/controller/JcbtPovertyApplicationController.java +++ b/backend/ruoyi-modules/ruoyi-jcbt/src/main/java/org/dromara/jcbt/controller/JcbtPovertyApplicationController.java @@ -65,7 +65,7 @@ public class JcbtPovertyApplicationController extends BaseController { //@SaCheckPermission("jcbt:povertyApplication:query") @GetMapping("/{id}") @Operation(summary = "获取贫困生认定申请详细信息") - public R getInfo(@Parameter(description = "主键") @PathVariable Long id) { + public R getInfo(@Parameter(description = "主键") @PathVariable("id") Long id) { return R.ok(povertyApplicationService.queryById(id)); } @@ -105,7 +105,7 @@ public class JcbtPovertyApplicationController extends BaseController { @Log(title = "删除贫困生认定申请", businessType = BusinessType.DELETE) @DeleteMapping("/{ids}") @Operation(summary = "删除贫困生认定申请") - public R remove(@Parameter(description = "主键集合") @NotEmpty(message = "主键不能为空") @PathVariable Long[] ids) { + public R remove(@Parameter(description = "主键集合") @NotEmpty(message = "主键不能为空") @PathVariable("ids") Long[] ids) { return toAjax(povertyApplicationService.deleteWithValidByIds(List.of(ids), true)); } @@ -165,7 +165,7 @@ public class JcbtPovertyApplicationController extends BaseController { @RepeatSubmit() @PutMapping("/submit/{id}") @Operation(summary = "提交申请") - public R submit(@Parameter(description = "申请ID") @PathVariable Long id) { + public R submit(@Parameter(description = "申请ID") @PathVariable("id") Long id) { return toAjax(povertyApplicationService.submitApplication(id)); } @@ -177,7 +177,7 @@ public class JcbtPovertyApplicationController extends BaseController { @RepeatSubmit() @PutMapping("/cancel/{id}") @Operation(summary = "撤销申请") - public R cancel(@Parameter(description = "申请ID") @PathVariable Long id) { + public R cancel(@Parameter(description = "申请ID") @PathVariable("id") Long id) { return toAjax(povertyApplicationService.cancelApplication(id)); } @@ -189,7 +189,7 @@ public class JcbtPovertyApplicationController extends BaseController { //@SaCheckPermission("jcbt:povertyApplication:query") @GetMapping("/byApplicationNo/{applicationNo}") @Operation(summary = "根据申请编号获取申请信息") - public R getInfoByApplicationNo(@Parameter(description = "申请编号") @PathVariable String applicationNo) { + public R getInfoByApplicationNo(@Parameter(description = "申请编号") @PathVariable("applicationNo") String applicationNo) { return R.ok(povertyApplicationService.queryByApplicationNo(applicationNo)); } @@ -245,10 +245,10 @@ public class JcbtPovertyApplicationController extends BaseController { //@SaCheckPermission("jcbt:povertyApplication:add") @GetMapping("/checkDuplicate") @Operation(summary = "检查学生申请是否重复") - public R checkDuplicate(@Parameter(description = "学生ID") @RequestParam Long studentId, - @Parameter(description = "学年") @RequestParam String academicYear, - @Parameter(description = "认定类型ID") @RequestParam Long recognitionTypeId, - @Parameter(description = "排除的申请ID") @RequestParam(required = false) Long excludeId) { + public R checkDuplicate(@Parameter(description = "学生ID") @RequestParam("studentId") Long studentId, + @Parameter(description = "学年") @RequestParam("academicYear") String academicYear, + @Parameter(description = "认定类型ID") @RequestParam("recognitionTypeId") Long recognitionTypeId, + @Parameter(description = "排除的申请ID") @RequestParam(value = "excludeId", required = false) Long excludeId) { boolean exists = povertyApplicationService.checkStudentApplicationExists(studentId, academicYear, recognitionTypeId, excludeId); return R.ok(exists); } @@ -261,7 +261,7 @@ public class JcbtPovertyApplicationController extends BaseController { //@SaCheckPermission("jcbt:povertyApplication:statistics") @GetMapping("/statistics") @Operation(summary = "获取申请统计信息") - public R> statistics(@Parameter(description = "班主任ID") @RequestParam(required = false) Long teacherId) { + public R> statistics(@Parameter(description = "班主任ID") @RequestParam(value = "teacherId", required = false) Long teacherId) { List statisticsList = povertyApplicationService.getApplicationStatistics(teacherId); // 转换为前端需要的格式 @@ -327,7 +327,7 @@ public class JcbtPovertyApplicationController extends BaseController { @Parameter(name = "classId", description = "班级ID", required = true) //@SaCheckPermission("jcbt:povertyApplication:list") @GetMapping("/class/{classId}/students") - public R>> getClassStudents(@PathVariable Long classId) { + public R>> getClassStudents(@PathVariable("classId") Long classId) { List> students = povertyApplicationService.getClassStudents(classId); return R.ok(students); } diff --git a/backend/ruoyi-modules/ruoyi-jcbt/src/main/java/org/dromara/jcbt/controller/JcbtPovertyApplicationReviewController.java b/backend/ruoyi-modules/ruoyi-jcbt/src/main/java/org/dromara/jcbt/controller/JcbtPovertyApplicationReviewController.java index 4216b7a1..d19ff4f9 100644 --- a/backend/ruoyi-modules/ruoyi-jcbt/src/main/java/org/dromara/jcbt/controller/JcbtPovertyApplicationReviewController.java +++ b/backend/ruoyi-modules/ruoyi-jcbt/src/main/java/org/dromara/jcbt/controller/JcbtPovertyApplicationReviewController.java @@ -89,7 +89,7 @@ public class JcbtPovertyApplicationReviewController extends BaseController { //@SaCheckPermission("jcbt:povertyApplication:detail") @GetMapping("/{id}") @Operation(summary = "获取申请详情") - public R getInfo(@Parameter(description = "申请ID") @PathVariable Long id) { + public R getInfo(@Parameter(description = "申请ID") @PathVariable("id") Long id) { return R.ok(povertyApplicationService.queryById(id)); } @@ -134,7 +134,7 @@ public class JcbtPovertyApplicationReviewController extends BaseController { @PutMapping("/batchApprove") @Operation(summary = "批量审核通过") public R batchApprove(@Parameter(description = "申请ID列表") @RequestBody List ids, - @Parameter(description = "审核意见") @RequestParam(required = false) String auditOpinion) { + @Parameter(description = "审核意见") @RequestParam(value = "auditOpinion", required = false) String auditOpinion) { return toAjax(povertyApplicationService.batchApproveApplications(ids, auditOpinion)); } @@ -146,7 +146,7 @@ public class JcbtPovertyApplicationReviewController extends BaseController { @PutMapping("/batchReject") @Operation(summary = "批量审核驳回") public R batchReject(@Parameter(description = "申请ID列表") @RequestBody List ids, - @Parameter(description = "审核意见") @RequestParam String auditOpinion) { + @Parameter(description = "审核意见") @RequestParam("auditOpinion") String auditOpinion) { return toAjax(povertyApplicationService.batchRejectApplications(ids, auditOpinion)); } @@ -158,8 +158,8 @@ public class JcbtPovertyApplicationReviewController extends BaseController { //@SaCheckPermission("jcbt:povertyApplication:statistics") @GetMapping("/statistics") @Operation(summary = "获取审核统计信息") - public R> statistics(@Parameter(description = "学年") @RequestParam(required = false) String academicYear, - @Parameter(description = "学院ID") @RequestParam(required = false) Long collegeId) { + public R> statistics(@Parameter(description = "学年") @RequestParam(value = "academicYear", required = false) String academicYear, + @Parameter(description = "学院ID") @RequestParam(value = "collegeId", required = false) Long collegeId) { List statisticsList = povertyApplicationService.getReviewStatistics(academicYear, collegeId); // 转换为前端需要的格式 @@ -185,8 +185,8 @@ public class JcbtPovertyApplicationReviewController extends BaseController { //@SaCheckPermission("jcbt:povertyApplication:statistics") @GetMapping("/workloadStatistics") @Operation(summary = "获取审核工作量统计") - public R>> workloadStatistics(@Parameter(description = "开始时间") @RequestParam(required = false) String startTime, - @Parameter(description = "结束时间") @RequestParam(required = false) String endTime) { + public R>> workloadStatistics(@Parameter(description = "开始时间") @RequestParam(value = "startTime", required = false) String startTime, + @Parameter(description = "结束时间") @RequestParam(value = "endTime", required = false) String endTime) { List> workloadStats = povertyApplicationService.getAuditorWorkloadStatistics(startTime, endTime); return R.ok(workloadStats); } @@ -227,7 +227,7 @@ public class JcbtPovertyApplicationReviewController extends BaseController { //@SaCheckPermission("jcbt:povertyApplication:detail") @GetMapping("/{id}/attachments") @Operation(summary = "获取申请附件预览信息") - public R> getAttachments(@Parameter(description = "申请ID") @PathVariable Long id) { + public R> getAttachments(@Parameter(description = "申请ID") @PathVariable("id") Long id) { JcbtPovertyApplicationVo application = povertyApplicationService.queryById(id); if (application == null) { return R.fail("申请不存在"); @@ -256,7 +256,7 @@ public class JcbtPovertyApplicationReviewController extends BaseController { //@SaCheckPermission("jcbt:povertyApplication:detail") @GetMapping("/{id}/history") @Operation(summary = "获取审核历史记录") - public R>> getAuditHistory(@Parameter(description = "申请ID") @PathVariable Long id) { + public R>> getAuditHistory(@Parameter(description = "申请ID") @PathVariable("id") Long id) { List> history = povertyApplicationService.getApplicationAuditHistory(id); return R.ok(history); } diff --git a/backend/ruoyi-modules/ruoyi-jcbt/src/main/java/org/dromara/jcbt/controller/JcbtScholarshipApplicationController.java b/backend/ruoyi-modules/ruoyi-jcbt/src/main/java/org/dromara/jcbt/controller/JcbtScholarshipApplicationController.java index d4324aaf..4ced8a78 100644 --- a/backend/ruoyi-modules/ruoyi-jcbt/src/main/java/org/dromara/jcbt/controller/JcbtScholarshipApplicationController.java +++ b/backend/ruoyi-modules/ruoyi-jcbt/src/main/java/org/dromara/jcbt/controller/JcbtScholarshipApplicationController.java @@ -66,7 +66,7 @@ public class JcbtScholarshipApplicationController extends BaseController { //@SaCheckPermission("jcbt:scholarshipApplication:query") @GetMapping("/{id}") @Operation(summary = "获取奖学金申请记录详细信息") - public R getInfo(@Parameter(description = "主键") @PathVariable Long id) { + public R getInfo(@Parameter(description = "主键") @PathVariable("id") Long id) { return R.ok(applicationService.queryById(id)); } @@ -120,7 +120,7 @@ public class JcbtScholarshipApplicationController extends BaseController { @Log(title = "奖学金申请记录", businessType = BusinessType.DELETE) @DeleteMapping("/{ids}") @Operation(summary = "删除奖学金申请记录") - public R remove(@Parameter(description = "主键串") @PathVariable Long[] ids) { + public R remove(@Parameter(description = "主键串") @PathVariable("ids") Long[] ids) { return toAjax(applicationService.deleteWithValidByIds(List.of(ids), true)); } @@ -130,8 +130,8 @@ public class JcbtScholarshipApplicationController extends BaseController { //@SaCheckPermission("jcbt:scholarshipApplication:available") @GetMapping("/available") @Operation(summary = "获取可申请的奖学金类型列表") - public R>> getAvailableScholarshipTypes(@Parameter(description = "班级ID") @RequestParam Long classId, - @Parameter(description = "批次ID") @RequestParam Long batchId) { + public R>> getAvailableScholarshipTypes(@Parameter(description = "班级ID") @RequestParam("classId") Long classId, + @Parameter(description = "批次ID") @RequestParam("batchId") Long batchId) { return R.ok(applicationService.queryAvailableScholarshipTypes(classId, batchId)); } @@ -143,8 +143,8 @@ public class JcbtScholarshipApplicationController extends BaseController { //@SaCheckPermission("jcbt:scholarshipApplication:my") @GetMapping("/my") @Operation(summary = "查询我的申请记录") - public R> getMyApplications(@Parameter(description = "申请人ID") @RequestParam Long applicantId, - @Parameter(description = "批次ID") @RequestParam(required = false) Long batchId) { + public R> getMyApplications(@Parameter(description = "申请人ID") @RequestParam("applicantId") Long applicantId, + @Parameter(description = "批次ID") @RequestParam(value = "batchId", required = false) Long batchId) { return R.ok(applicationService.queryApplicationsByApplicant(applicantId, batchId)); } @@ -154,8 +154,8 @@ public class JcbtScholarshipApplicationController extends BaseController { //@SaCheckPermission("jcbt:scholarshipApplication:pending") @GetMapping("/pending") @Operation(summary = "查询待审核申请") - public R> getPendingApplications(@Parameter(description = "审核人ID") @RequestParam(required = false) Long reviewerId, - @Parameter(description = "申请状态") @RequestParam(required = false) String status) { + public R> getPendingApplications(@Parameter(description = "审核人ID") @RequestParam(value = "reviewerId", required = false) Long reviewerId, + @Parameter(description = "申请状态") @RequestParam(value = "status", required = false) String status) { return R.ok(applicationService.queryPendingApplications(reviewerId, status)); } @@ -165,9 +165,9 @@ public class JcbtScholarshipApplicationController extends BaseController { //@SaCheckPermission("jcbt:scholarshipApplication:check") @GetMapping("/check") @Operation(summary = "检查学生申请资格") - public R> checkStudentEligibility(@Parameter(description = "学生ID") @RequestParam Long studentId, - @Parameter(description = "批次ID") @RequestParam Long batchId, - @Parameter(description = "奖学金类型ID") @RequestParam Long scholarshipTypeId) { + public R> checkStudentEligibility(@Parameter(description = "学生ID") @RequestParam("studentId") Long studentId, + @Parameter(description = "批次ID") @RequestParam("batchId") Long batchId, + @Parameter(description = "奖学金类型ID") @RequestParam("scholarshipTypeId") Long scholarshipTypeId) { return R.ok(applicationService.checkStudentEligibility(studentId, batchId, scholarshipTypeId)); } @@ -179,10 +179,10 @@ public class JcbtScholarshipApplicationController extends BaseController { @PostMapping("/approve") @Operation(summary = "批量审核申请") public R batchApprove(@Parameter(description = "申请ID列表") @RequestBody @NotEmpty List applicationIds, - @Parameter(description = "审核状态") @RequestParam String status, - @Parameter(description = "审核人ID") @RequestParam Long reviewerId, - @Parameter(description = "审核人姓名") @RequestParam String reviewerName, - @Parameter(description = "审核意见") @RequestParam(required = false) String reviewComment) { + @Parameter(description = "审核状态") @RequestParam("status") String status, + @Parameter(description = "审核人ID") @RequestParam("reviewerId") Long reviewerId, + @Parameter(description = "审核人姓名") @RequestParam("reviewerName") String reviewerName, + @Parameter(description = "审核意见") @RequestParam(value = "reviewComment", required = false) String reviewComment) { return toAjax(applicationService.batchReviewApplications(applicationIds, status, reviewerId, reviewerName, reviewComment)); } @@ -225,8 +225,8 @@ public class JcbtScholarshipApplicationController extends BaseController { //@SaCheckPermission("jcbt:scholarshipApplication:statistics") @GetMapping("/statistics") @Operation(summary = "获取申请统计数据") - public R> getStatistics(@Parameter(description = "批次ID") @RequestParam(required = false) Long batchId, - @Parameter(description = "学院ID") @RequestParam(required = false) Long deptId) { + public R> getStatistics(@Parameter(description = "批次ID") @RequestParam(value = "batchId", required = false) Long batchId, + @Parameter(description = "学院ID") @RequestParam(value = "deptId", required = false) Long deptId) { return R.ok(applicationService.getApplicationStatistics(batchId, deptId)); } @@ -237,9 +237,9 @@ public class JcbtScholarshipApplicationController extends BaseController { @Log(title = "班主任批量申请提交", businessType = BusinessType.INSERT) @PostMapping("/batch") @Operation(summary = "班主任批量申请提交") - public R batchSubmitByTeacher(@Parameter(description = "批次ID") @RequestParam Long batchId, - @Parameter(description = "奖学金类型ID") @RequestParam Long scholarshipTypeId, - @Parameter(description = "班级ID") @RequestParam Long classId, + public R batchSubmitByTeacher(@Parameter(description = "批次ID") @RequestParam("batchId") Long batchId, + @Parameter(description = "奖学金类型ID") @RequestParam("scholarshipTypeId") Long scholarshipTypeId, + @Parameter(description = "班级ID") @RequestParam("classId") Long classId, @Parameter(description = "学生申请列表") @RequestBody @NotEmpty List studentApplications) { return toAjax(applicationService.batchSubmitApplicationsByTeacher(batchId, scholarshipTypeId, classId, studentApplications)); } @@ -263,7 +263,7 @@ public class JcbtScholarshipApplicationController extends BaseController { @PostMapping("/{id}/withdraw") @Operation(summary = "撤回申请") public R withdrawApplication(@Parameter(description = "申请ID") @PathVariable @NotNull Long id, - @Parameter(description = "撤回原因") @RequestParam(required = false) String reason) { + @Parameter(description = "撤回原因") @RequestParam(value = "reason", required = false) String reason) { return toAjax(applicationService.withdrawApplication(id, reason)); } @@ -275,8 +275,8 @@ public class JcbtScholarshipApplicationController extends BaseController { //@SaCheckPermission("jcbt:scholarshipApplication:quota") @GetMapping("/quota") @Operation(summary = "获取班级名额使用情况") - public R> getClassQuotaUsage(@Parameter(description = "班级ID") @RequestParam Long classId, - @Parameter(description = "批次ID") @RequestParam Long batchId) { + public R> getClassQuotaUsage(@Parameter(description = "班级ID") @RequestParam("classId") Long classId, + @Parameter(description = "批次ID") @RequestParam("batchId") Long batchId) { return R.ok(applicationService.getClassQuotaUsage(classId, batchId)); } @@ -288,7 +288,7 @@ public class JcbtScholarshipApplicationController extends BaseController { //@SaCheckPermission("jcbt:scholarshipApplication:classInfo") @GetMapping("/classInfo") @Operation(summary = "获取班主任所带班级信息") - public R> getClassInfoByTeacher(@Parameter(description = "班主任ID") @RequestParam Long teacherId) { + public R> getClassInfoByTeacher(@Parameter(description = "班主任ID") @RequestParam("teacherId") Long teacherId) { return R.ok(applicationService.getClassInfoByTeacher(teacherId)); } @@ -298,7 +298,7 @@ public class JcbtScholarshipApplicationController extends BaseController { //@SaCheckPermission("jcbt:scholarshipApplication:students") @GetMapping("/students") @Operation(summary = "获取班级学生列表") - public R>> getClassStudents(@Parameter(description = "班级ID") @RequestParam Long classId) { + public R>> getClassStudents(@Parameter(description = "班级ID") @RequestParam("classId") Long classId) { return R.ok(applicationService.getClassStudents(classId)); } @@ -308,7 +308,7 @@ public class JcbtScholarshipApplicationController extends BaseController { //@SaCheckPermission("jcbt:scholarshipApplication:scholarshipTypes") @GetMapping("/scholarshipTypes") @Operation(summary = "根据批次获取可申请的奖学金类型") - public R>> getScholarshipTypesByBatch(@Parameter(description = "批次ID") @RequestParam Long batchId) { + public R>> getScholarshipTypesByBatch(@Parameter(description = "批次ID") @RequestParam("batchId") Long batchId) { return R.ok(applicationService.getScholarshipTypesByBatch(batchId)); } @@ -319,8 +319,8 @@ public class JcbtScholarshipApplicationController extends BaseController { @GetMapping("/scholarshipTypesWithQuota") @Operation(summary = "根据批次和班级获取带名额信息的奖学金类型") public R>> getScholarshipTypesWithQuota( - @Parameter(description = "批次ID") @RequestParam Long batchId, - @Parameter(description = "班级ID") @RequestParam Long classId) { + @Parameter(description = "批次ID") @RequestParam("batchId") Long batchId, + @Parameter(description = "班级ID") @RequestParam("classId") Long classId) { return R.ok(applicationService.getScholarshipTypesWithQuota(batchId, classId)); } @@ -330,8 +330,8 @@ public class JcbtScholarshipApplicationController extends BaseController { //@SaCheckPermission("jcbt:scholarshipApplication:classInfo") @PostMapping("/confirmClass") @Operation(summary = "确认选择班级") - public R> confirmClassSelection(@Parameter(description = "班主任ID") @RequestParam Long teacherId, - @Parameter(description = "班级ID") @RequestParam Long classId) { + public R> confirmClassSelection(@Parameter(description = "班主任ID") @RequestParam("teacherId") Long teacherId, + @Parameter(description = "班级ID") @RequestParam("classId") Long classId) { return R.ok(applicationService.confirmClassSelection(teacherId, classId)); } @@ -341,8 +341,8 @@ public class JcbtScholarshipApplicationController extends BaseController { //@SaCheckPermission("jcbt:scholarshipApplication:scholarshipTypes") @GetMapping("/test/scholarshipTypesStructure") @Operation(summary = "测试接口:获取奖学金类型数据结构") - public R> testScholarshipTypesStructure(@Parameter(description = "批次ID") @RequestParam Long batchId, - @Parameter(description = "班级ID") @RequestParam(required = false) Long classId) { + public R> testScholarshipTypesStructure(@Parameter(description = "批次ID") @RequestParam("batchId") Long batchId, + @Parameter(description = "班级ID") @RequestParam(value = "classId", required = false) Long classId) { Map result = new HashMap<>(); try { if (classId != null) { @@ -364,9 +364,9 @@ public class JcbtScholarshipApplicationController extends BaseController { //@SaCheckPermission("jcbt:scholarshipApplication:scholarshipTypes") @GetMapping("/debug/sqlLogs") @Operation(summary = "调试接口:详细SQL日志输出测试") - public R> debugSqlLogs(@Parameter(description = "批次ID") @RequestParam Long batchId, - @Parameter(description = "班级ID") @RequestParam Long classId, - @Parameter(description = "奖学金类型ID(可选,测试单个类型)") @RequestParam(required = false) Long scholarshipTypeId) { + public R> debugSqlLogs(@Parameter(description = "批次ID") @RequestParam("batchId") Long batchId, + @Parameter(description = "班级ID") @RequestParam("classId") Long classId, + @Parameter(description = "奖学金类型ID(可选,测试单个类型)") @RequestParam(value = "scholarshipTypeId", required = false) Long scholarshipTypeId) { Map result = new HashMap<>(); try { diff --git a/backend/ruoyi-modules/ruoyi-jcbt/src/main/java/org/dromara/jcbt/controller/JcbtScholarshipBatchController.java b/backend/ruoyi-modules/ruoyi-jcbt/src/main/java/org/dromara/jcbt/controller/JcbtScholarshipBatchController.java index aed20df6..6a5272dc 100644 --- a/backend/ruoyi-modules/ruoyi-jcbt/src/main/java/org/dromara/jcbt/controller/JcbtScholarshipBatchController.java +++ b/backend/ruoyi-modules/ruoyi-jcbt/src/main/java/org/dromara/jcbt/controller/JcbtScholarshipBatchController.java @@ -64,7 +64,7 @@ public class JcbtScholarshipBatchController extends BaseController { //@SaCheckPermission("jcbt:scholarshipBatch:query") @GetMapping("/{id}") public R getInfo(@NotNull(message = "主键不能为空") - @PathVariable Long id) { + @PathVariable("id") Long id) { return R.ok(scholarshipBatchService.queryById(id)); } @@ -97,7 +97,7 @@ public class JcbtScholarshipBatchController extends BaseController { @Log(title = "奖学金评定批次", businessType = BusinessType.DELETE) @DeleteMapping("/{ids}") public R remove(@NotEmpty(message = "主键不能为空") - @PathVariable Long[] ids) { + @PathVariable("ids") Long[] ids) { return toAjax(scholarshipBatchService.deleteWithValidByIds(List.of(ids), true)); } @@ -106,7 +106,7 @@ public class JcbtScholarshipBatchController extends BaseController { */ //@SaCheckPermission("jcbt:scholarshipBatch:query") @GetMapping("/getByCode/{batchCode}") - public R getByBatchCode(@PathVariable String batchCode) { + public R getByBatchCode(@PathVariable("batchCode") String batchCode) { return R.ok(scholarshipBatchService.queryByBatchCode(batchCode)); } @@ -116,8 +116,8 @@ public class JcbtScholarshipBatchController extends BaseController { //@SaCheckPermission("jcbt:scholarshipBatch:query") @GetMapping("/getByAcademicYear") public R> getByAcademicYearAndSemester( - @RequestParam String academicYear, - @RequestParam(required = false) Integer semester) { + @RequestParam("academicYear") String academicYear, + @RequestParam(value = "semester", required = false) Integer semester) { return R.ok(scholarshipBatchService.queryByAcademicYearAndSemester(academicYear, semester)); } @@ -135,8 +135,8 @@ public class JcbtScholarshipBatchController extends BaseController { */ //@SaCheckPermission("jcbt:scholarshipBatch:query") @GetMapping("/checkBatchCodeUnique") - public R checkBatchCodeUnique(@RequestParam String batchCode, - @RequestParam(required = false) Long id) { + public R checkBatchCodeUnique(@RequestParam("batchCode") String batchCode, + @RequestParam(value = "id", required = false) Long id) { return R.ok(scholarshipBatchService.checkBatchCodeUnique(batchCode, id)); } @@ -146,7 +146,7 @@ public class JcbtScholarshipBatchController extends BaseController { //@SaCheckPermission("jcbt:scholarshipBatch:edit") @Log(title = "奖学金评定批次", businessType = BusinessType.UPDATE) @PutMapping("/changeStatus") - public R changeStatus(@RequestParam Long id, @RequestParam String status) { + public R changeStatus(@RequestParam("id") Long id, @RequestParam("status") String status) { return toAjax(scholarshipBatchService.changeStatus(id, status)); } @@ -164,7 +164,7 @@ public class JcbtScholarshipBatchController extends BaseController { */ //@SaCheckPermission("jcbt:scholarshipBatch:query") @GetMapping("/getByStatus/{status}") - public R> getByStatus(@PathVariable String status) { + public R> getByStatus(@PathVariable("status") String status) { return R.ok(scholarshipBatchService.queryByStatus(status)); } diff --git a/backend/ruoyi-modules/ruoyi-jcbt/src/main/java/org/dromara/jcbt/controller/JcbtScholarshipQuotaController.java b/backend/ruoyi-modules/ruoyi-jcbt/src/main/java/org/dromara/jcbt/controller/JcbtScholarshipQuotaController.java index d863d97e..f25be64f 100644 --- a/backend/ruoyi-modules/ruoyi-jcbt/src/main/java/org/dromara/jcbt/controller/JcbtScholarshipQuotaController.java +++ b/backend/ruoyi-modules/ruoyi-jcbt/src/main/java/org/dromara/jcbt/controller/JcbtScholarshipQuotaController.java @@ -52,7 +52,7 @@ public class JcbtScholarshipQuotaController extends BaseController { */ //@SaCheckPermission("jcbt:scholarshipQuota:list") @GetMapping("/listByBatch/{batchId}") - public R> listByBatch(@PathVariable Long batchId) { + public R> listByBatch(@PathVariable("batchId") Long batchId) { List list = scholarshipQuotaService.queryListByBatchId(batchId); return R.ok(list); } @@ -62,8 +62,8 @@ public class JcbtScholarshipQuotaController extends BaseController { */ //@SaCheckPermission("jcbt:scholarshipQuota:list") @GetMapping("/listByBatchAndType") - public R> listByBatchAndType(@RequestParam Long batchId, - @RequestParam Long scholarshipTypeId) { + public R> listByBatchAndType(@RequestParam("batchId") Long batchId, + @RequestParam("scholarshipTypeId") Long scholarshipTypeId) { List list = scholarshipQuotaService.queryListByBatchAndType(batchId, scholarshipTypeId); return R.ok(list); } @@ -73,8 +73,8 @@ public class JcbtScholarshipQuotaController extends BaseController { */ //@SaCheckPermission("jcbt:scholarshipQuota:list") @GetMapping("/tree") - public R> tree(@RequestParam Long batchId, - @RequestParam Long scholarshipTypeId) { + public R> tree(@RequestParam("batchId") Long batchId, + @RequestParam("scholarshipTypeId") Long scholarshipTypeId) { List tree = scholarshipQuotaService.queryQuotaTree(batchId, scholarshipTypeId); return R.ok(tree); } @@ -84,7 +84,7 @@ public class JcbtScholarshipQuotaController extends BaseController { */ //@SaCheckPermission("jcbt:scholarshipQuota:list") @GetMapping("/statistics/{batchId}") - public R> statistics(@PathVariable Long batchId) { + public R> statistics(@PathVariable("batchId") Long batchId) { Map statistics = scholarshipQuotaService.queryQuotaUsageStatistics(batchId); return R.ok(statistics); } @@ -105,7 +105,7 @@ public class JcbtScholarshipQuotaController extends BaseController { */ //@SaCheckPermission("jcbt:scholarshipQuota:query") @GetMapping("/{id}") - public R getInfo(@NotNull(message = "主键不能为空") @PathVariable Long id) { + public R getInfo(@NotNull(message = "主键不能为空") @PathVariable("id") Long id) { return R.ok(scholarshipQuotaService.queryById(id)); } @@ -137,7 +137,7 @@ public class JcbtScholarshipQuotaController extends BaseController { //@SaCheckPermission("jcbt:scholarshipQuota:remove") @Log(title = "删除奖学金名额分配", businessType = BusinessType.DELETE) @DeleteMapping("/{ids}") - public R remove(@NotEmpty(message = "主键不能为空") @PathVariable Long[] ids) { + public R remove(@NotEmpty(message = "主键不能为空") @PathVariable("ids") Long[] ids) { return toAjax(scholarshipQuotaService.deleteWithValidByIds(List.of(ids), true)); } @@ -157,8 +157,8 @@ public class JcbtScholarshipQuotaController extends BaseController { //@SaCheckPermission("jcbt:scholarshipQuota:remove") @Log(title = "清空奖学金名额分配", businessType = BusinessType.DELETE) @DeleteMapping("/clear") - public R clearQuotaByBatchAndType(@RequestParam Long batchId, - @RequestParam(required = false) Long scholarshipTypeId) { + public R clearQuotaByBatchAndType(@RequestParam("batchId") Long batchId, + @RequestParam(value = "scholarshipTypeId", required = false) Long scholarshipTypeId) { return toAjax(scholarshipQuotaService.clearQuotaByBatchAndType(batchId, scholarshipTypeId)); } @@ -169,8 +169,8 @@ public class JcbtScholarshipQuotaController extends BaseController { @Log(title = "批量分配奖学金名额", businessType = BusinessType.INSERT) @RepeatSubmit() @PostMapping("/batchAllocate") - public R batchAllocate(@RequestParam Long batchId, - @RequestParam Long scholarshipTypeId, + public R batchAllocate(@RequestParam("batchId") Long batchId, + @RequestParam("scholarshipTypeId") Long scholarshipTypeId, @RequestBody List quotaAllocations) { return toAjax(scholarshipQuotaService.batchAllocateQuota(batchId, scholarshipTypeId, quotaAllocations)); } @@ -182,10 +182,10 @@ public class JcbtScholarshipQuotaController extends BaseController { @Log(title = "调整奖学金名额分配", businessType = BusinessType.UPDATE) @RepeatSubmit() @PostMapping("/adjust") - public R adjustQuota(@RequestParam Long fromQuotaId, - @RequestParam Long toQuotaId, - @RequestParam Integer adjustAmount, - @RequestParam String reason) { + public R adjustQuota(@RequestParam("fromQuotaId") Long fromQuotaId, + @RequestParam("toQuotaId") Long toQuotaId, + @RequestParam("adjustAmount") Integer adjustAmount, + @RequestParam("reason") String reason) { return toAjax(scholarshipQuotaService.adjustQuotaAllocation(fromQuotaId, toQuotaId, adjustAmount, reason)); } @@ -195,7 +195,7 @@ public class JcbtScholarshipQuotaController extends BaseController { //@SaCheckPermission("jcbt:scholarshipQuota:edit") @Log(title = "锁定/解锁奖学金名额分配", businessType = BusinessType.UPDATE) @PutMapping("/lock/{id}") - public R lockQuota(@PathVariable Long id, @RequestParam Integer isLocked) { + public R lockQuota(@PathVariable("id") Long id, @RequestParam("isLocked") Integer isLocked) { return toAjax(scholarshipQuotaService.lockQuotaAllocation(id, isLocked)); } @@ -206,9 +206,9 @@ public class JcbtScholarshipQuotaController extends BaseController { @Log(title = "自动分配奖学金名额", businessType = BusinessType.UPDATE) @RepeatSubmit() @PostMapping("/autoAllocate") - public R autoAllocate(@RequestParam Long batchId, - @RequestParam Long scholarshipTypeId, - @RequestParam String allocationRule) { + public R autoAllocate(@RequestParam("batchId") Long batchId, + @RequestParam("scholarshipTypeId") Long scholarshipTypeId, + @RequestParam("allocationRule") String allocationRule) { return toAjax(scholarshipQuotaService.autoAllocateQuota(batchId, scholarshipTypeId, allocationRule)); } @@ -219,8 +219,8 @@ public class JcbtScholarshipQuotaController extends BaseController { @Log(title = "复制奖学金名额分配", businessType = BusinessType.INSERT) @RepeatSubmit() @PostMapping("/copy") - public R copyQuota(@RequestParam Long sourceBatchId, - @RequestParam Long targetBatchId, + public R copyQuota(@RequestParam("sourceBatchId") Long sourceBatchId, + @RequestParam("targetBatchId") Long targetBatchId, @RequestBody List scholarshipTypeIds) { return toAjax(scholarshipQuotaService.copyQuotaFromBatch(sourceBatchId, targetBatchId, scholarshipTypeIds)); } @@ -231,7 +231,7 @@ public class JcbtScholarshipQuotaController extends BaseController { //@SaCheckPermission("jcbt:scholarshipQuota:edit") @Log(title = "更新奖学金名额使用情况", businessType = BusinessType.UPDATE) @PutMapping("/updateUsage/{id}") - public R updateUsage(@PathVariable Long id, @RequestParam Integer usedChange) { + public R updateUsage(@PathVariable("id") Long id, @RequestParam("usedChange") Integer usedChange) { return toAjax(scholarshipQuotaService.updateQuotaUsage(id, usedChange)); } diff --git a/backend/ruoyi-modules/ruoyi-jcbt/src/main/java/org/dromara/jcbt/controller/JcbtScholarshipReviewController.java b/backend/ruoyi-modules/ruoyi-jcbt/src/main/java/org/dromara/jcbt/controller/JcbtScholarshipReviewController.java index 9c874d63..ff8c4417 100644 --- a/backend/ruoyi-modules/ruoyi-jcbt/src/main/java/org/dromara/jcbt/controller/JcbtScholarshipReviewController.java +++ b/backend/ruoyi-modules/ruoyi-jcbt/src/main/java/org/dromara/jcbt/controller/JcbtScholarshipReviewController.java @@ -64,7 +64,7 @@ public class JcbtScholarshipReviewController extends BaseController { //@SaCheckPermission("jcbt:review:query") @GetMapping("/{id}") public R getInfo(@NotNull(message = "主键不能为空") - @PathVariable Long id) { + @PathVariable("id") Long id) { return R.ok(reviewService.queryById(id)); } @@ -78,7 +78,7 @@ public class JcbtScholarshipReviewController extends BaseController { //@SaCheckPermission("jcbt:review:query") @GetMapping("/application/{applicationId}") public R> getReviewsByApplicationId( - @NotNull(message = "申请ID不能为空") @PathVariable Long applicationId) { + @NotNull(message = "申请ID不能为空") @PathVariable("applicationId") Long applicationId) { return R.ok(reviewService.queryReviewsByApplicationId(applicationId)); } @@ -88,10 +88,10 @@ public class JcbtScholarshipReviewController extends BaseController { //@SaCheckPermission("jcbt:review:pending") @GetMapping("/pending") public TableDataInfo getPendingReviews( - @RequestParam(required = false) Long reviewerId, - @RequestParam(required = false) String reviewLevel, - @RequestParam(required = false) String applicationNo, - @RequestParam(required = false) String studentName, + @RequestParam(value = "reviewerId", required = false) Long reviewerId, + @RequestParam(value = "reviewLevel", required = false) String reviewLevel, + @RequestParam(value = "applicationNo", required = false) String applicationNo, + @RequestParam(value = "studentName", required = false) String studentName, PageQuery pageQuery) { return reviewService.queryPendingReviews(reviewerId, reviewLevel, applicationNo, studentName, pageQuery); } @@ -102,11 +102,11 @@ public class JcbtScholarshipReviewController extends BaseController { //@SaCheckPermission("jcbt:review:history") @GetMapping("/history") public TableDataInfo getReviewHistory( - @RequestParam(required = false) Long reviewerId, - @RequestParam(required = false) String reviewResult, - @RequestParam(required = false) Long batchId, - @RequestParam(required = false) String startTime, - @RequestParam(required = false) String endTime, + @RequestParam(value = "reviewerId", required = false) Long reviewerId, + @RequestParam(value = "reviewResult", required = false) String reviewResult, + @RequestParam(value = "batchId", required = false) Long batchId, + @RequestParam(value = "startTime", required = false) String startTime, + @RequestParam(value = "endTime", required = false) String endTime, PageQuery pageQuery) { return reviewService.queryReviewHistory(reviewerId, reviewResult, batchId, startTime, endTime, pageQuery); } @@ -119,11 +119,11 @@ public class JcbtScholarshipReviewController extends BaseController { @RepeatSubmit() @PostMapping("/submit") public R submitReview( - @NotNull(message = "审核记录ID不能为空") @RequestParam Long reviewId, - @NotEmpty(message = "审核结果不能为空") @RequestParam String reviewResult, - @RequestParam(required = false) String reviewOpinion, - @RequestParam(required = false) Double reviewScore, - @RequestParam(required = false) Long nextReviewerId) { + @NotNull(message = "审核记录ID不能为空") @RequestParam("reviewId") Long reviewId, + @NotEmpty(message = "审核结果不能为空") @RequestParam("reviewResult") String reviewResult, + @RequestParam(value = "reviewOpinion", required = false) String reviewOpinion, + @RequestParam(value = "reviewScore", required = false) Double reviewScore, + @RequestParam(value = "nextReviewerId", required = false) Long nextReviewerId) { return toAjax(reviewService.submitReview(reviewId, reviewResult, reviewOpinion, reviewScore, nextReviewerId)); } @@ -135,11 +135,11 @@ public class JcbtScholarshipReviewController extends BaseController { @RepeatSubmit() @PostMapping("/batch") public R batchReview( - @NotEmpty(message = "审核记录ID列表不能为空") @RequestParam List reviewIds, - @NotEmpty(message = "审核结果不能为空") @RequestParam String reviewResult, - @RequestParam(required = false) String reviewOpinion, - @NotNull(message = "审核人ID不能为空") @RequestParam Long reviewerId, - @NotEmpty(message = "审核人姓名不能为空") @RequestParam String reviewerName) { + @NotEmpty(message = "审核记录ID列表不能为空") @RequestParam("reviewIds") List reviewIds, + @NotEmpty(message = "审核结果不能为空") @RequestParam("reviewResult") String reviewResult, + @RequestParam(value = "reviewOpinion", required = false) String reviewOpinion, + @NotNull(message = "审核人ID不能为空") @RequestParam("reviewerId") Long reviewerId, + @NotEmpty(message = "审核人姓名不能为空") @RequestParam("reviewerName") String reviewerName) { return toAjax(reviewService.batchReview(reviewIds, reviewResult, reviewOpinion, reviewerId, reviewerName)); } @@ -154,10 +154,10 @@ public class JcbtScholarshipReviewController extends BaseController { @RepeatSubmit() @PostMapping("/transfer") public R transferReview( - @NotNull(message = "审核记录ID不能为空") @RequestParam Long reviewId, - @NotNull(message = "新审核人ID不能为空") @RequestParam Long newReviewerId, - @NotEmpty(message = "新审核人姓名不能为空") @RequestParam String newReviewerName, - @RequestParam(required = false) String reason) { + @NotNull(message = "审核记录ID不能为空") @RequestParam("reviewId") Long reviewId, + @NotNull(message = "新审核人ID不能为空") @RequestParam("newReviewerId") Long newReviewerId, + @NotEmpty(message = "新审核人姓名不能为空") @RequestParam("newReviewerName") String newReviewerName, + @RequestParam(value = "reason", required = false) String reason) { return toAjax(reviewService.transferReview(reviewId, newReviewerId, newReviewerName, reason)); } @@ -169,8 +169,8 @@ public class JcbtScholarshipReviewController extends BaseController { @RepeatSubmit() @PostMapping("/withdraw") public R withdrawReview( - @NotNull(message = "审核记录ID不能为空") @RequestParam Long reviewId, - @RequestParam(required = false) String reason) { + @NotNull(message = "审核记录ID不能为空") @RequestParam("reviewId") Long reviewId, + @RequestParam(value = "reason", required = false) String reason) { return toAjax(reviewService.withdrawReview(reviewId, reason)); } @@ -180,7 +180,7 @@ public class JcbtScholarshipReviewController extends BaseController { //@SaCheckPermission("jcbt:review:query") @GetMapping("/latest/{applicationId}") public R getLatestReview( - @NotNull(message = "申请ID不能为空") @PathVariable Long applicationId) { + @NotNull(message = "申请ID不能为空") @PathVariable("applicationId") Long applicationId) { return R.ok(reviewService.queryLatestReviewByApplicationId(applicationId)); } @@ -190,8 +190,8 @@ public class JcbtScholarshipReviewController extends BaseController { //@SaCheckPermission("jcbt:review:query") @GetMapping("/level/{applicationId}/{reviewLevel}") public R getReviewByLevel( - @NotNull(message = "申请ID不能为空") @PathVariable Long applicationId, - @NotEmpty(message = "审核级别不能为空") @PathVariable String reviewLevel) { + @NotNull(message = "申请ID不能为空") @PathVariable("applicationId") Long applicationId, + @NotEmpty(message = "审核级别不能为空") @PathVariable("reviewLevel") String reviewLevel) { return R.ok(reviewService.queryReviewByApplicationAndLevel(applicationId, reviewLevel)); } @@ -201,10 +201,10 @@ public class JcbtScholarshipReviewController extends BaseController { //@SaCheckPermission("jcbt:review:statistics") @GetMapping("/statistics/count") public R> getReviewCount( - @RequestParam(required = false) Long reviewerId, - @RequestParam(required = false) String reviewLevel, - @RequestParam(required = false) String reviewResult, - @RequestParam(required = false) Long batchId) { + @RequestParam(value = "reviewerId", required = false) Long reviewerId, + @RequestParam(value = "reviewLevel", required = false) String reviewLevel, + @RequestParam(value = "reviewResult", required = false) String reviewResult, + @RequestParam(value = "batchId", required = false) Long batchId) { return R.ok(reviewService.countReviewsByCondition(reviewerId, reviewLevel, reviewResult, batchId)); } @@ -214,8 +214,8 @@ public class JcbtScholarshipReviewController extends BaseController { //@SaCheckPermission("jcbt:review:query") @GetMapping("/next-reviewers/{applicationId}/{currentLevel}") public R> getNextReviewers( - @NotNull(message = "申请ID不能为空") @PathVariable Long applicationId, - @NotEmpty(message = "当前审核级别不能为空") @PathVariable String currentLevel) { + @NotNull(message = "申请ID不能为空") @PathVariable("applicationId") Long applicationId, + @NotEmpty(message = "当前审核级别不能为空") @PathVariable("currentLevel") String currentLevel) { return R.ok(reviewService.getNextReviewers(applicationId, currentLevel)); } @@ -227,11 +227,11 @@ public class JcbtScholarshipReviewController extends BaseController { @RepeatSubmit() @PostMapping("/advance") public R advanceReviewProcess( - @NotNull(message = "申请ID不能为空") @RequestParam Long applicationId, - @NotEmpty(message = "当前审核级别不能为空") @RequestParam String currentLevel, - @NotEmpty(message = "审核结果不能为空") @RequestParam String reviewResult, - @RequestParam(required = false) String reviewOpinion, - @RequestParam(required = false) Double reviewScore) { + @NotNull(message = "申请ID不能为空") @RequestParam("applicationId") Long applicationId, + @NotEmpty(message = "当前审核级别不能为空") @RequestParam("currentLevel") String currentLevel, + @NotEmpty(message = "审核结果不能为空") @RequestParam("reviewResult") String reviewResult, + @RequestParam(value = "reviewOpinion", required = false) String reviewOpinion, + @RequestParam(value = "reviewScore", required = false) Double reviewScore) { return toAjax(reviewService.advanceReviewProcess(applicationId, currentLevel, reviewResult, reviewOpinion, reviewScore)); } @@ -241,9 +241,9 @@ public class JcbtScholarshipReviewController extends BaseController { //@SaCheckPermission("jcbt:review:query") @GetMapping("/permission") public R checkReviewPermission( - @NotNull(message = "审核人ID不能为空") @RequestParam Long reviewerId, - @NotEmpty(message = "审核级别不能为空") @RequestParam String reviewLevel, - @NotNull(message = "申请ID不能为空") @RequestParam Long applicationId) { + @NotNull(message = "审核人ID不能为空") @RequestParam("reviewerId") Long reviewerId, + @NotEmpty(message = "审核级别不能为空") @RequestParam("reviewLevel") String reviewLevel, + @NotNull(message = "申请ID不能为空") @RequestParam("applicationId") Long applicationId) { return R.ok(reviewService.checkReviewPermission(reviewerId, reviewLevel, applicationId)); } @@ -253,9 +253,9 @@ public class JcbtScholarshipReviewController extends BaseController { //@SaCheckPermission("jcbt:review:statistics") @GetMapping("/statistics") public R> getReviewStatistics( - @RequestParam(required = false) Long reviewerId, - @RequestParam(required = false) String reviewLevel, - @RequestParam(required = false) Long batchId) { + @RequestParam(value = "reviewerId", required = false) Long reviewerId, + @RequestParam(value = "reviewLevel", required = false) String reviewLevel, + @RequestParam(value = "batchId", required = false) Long batchId) { return R.ok(reviewService.getReviewStatistics(reviewerId, reviewLevel, batchId)); } diff --git a/backend/ruoyi-modules/ruoyi-jcbt/src/main/java/org/dromara/jcbt/controller/JcbtScholarshipTypeController.java b/backend/ruoyi-modules/ruoyi-jcbt/src/main/java/org/dromara/jcbt/controller/JcbtScholarshipTypeController.java index 986659dd..2b11142f 100644 --- a/backend/ruoyi-modules/ruoyi-jcbt/src/main/java/org/dromara/jcbt/controller/JcbtScholarshipTypeController.java +++ b/backend/ruoyi-modules/ruoyi-jcbt/src/main/java/org/dromara/jcbt/controller/JcbtScholarshipTypeController.java @@ -70,7 +70,7 @@ public class JcbtScholarshipTypeController extends BaseController { //@SaCheckPermission("jcbt:scholarshipType:query") @GetMapping("/{id}") public R getInfo(@NotNull(message = "主键不能为空") - @PathVariable Long id) { + @PathVariable("id") Long id) { return R.ok(scholarshipTypeService.queryById(id)); } @@ -103,7 +103,7 @@ public class JcbtScholarshipTypeController extends BaseController { @Log(title = "奖学金类型", businessType = BusinessType.DELETE) @DeleteMapping("/{ids}") public R remove(@NotEmpty(message = "主键不能为空") - @PathVariable Long[] ids) { + @PathVariable("ids") Long[] ids) { return toAjax(scholarshipTypeService.deleteWithValidByIds(List.of(ids), true)); } @@ -112,7 +112,7 @@ public class JcbtScholarshipTypeController extends BaseController { */ //@SaCheckPermission("jcbt:scholarshipType:query") @GetMapping("/getByName/{typeName}") - public R getByTypeName(@PathVariable String typeName) { + public R getByTypeName(@PathVariable("typeName") String typeName) { return R.ok(scholarshipTypeService.queryByTypeName(typeName)); } @@ -121,7 +121,7 @@ public class JcbtScholarshipTypeController extends BaseController { */ //@SaCheckPermission("jcbt:scholarshipType:query") @GetMapping("/getByCategory/{typeCategory}") - public R> getByCategory(@PathVariable String typeCategory) { + public R> getByCategory(@PathVariable("typeCategory") String typeCategory) { return R.ok(scholarshipTypeService.queryByCategory(typeCategory)); } @@ -139,8 +139,8 @@ public class JcbtScholarshipTypeController extends BaseController { */ //@SaCheckPermission("jcbt:scholarshipType:query") @GetMapping("/checkTypeNameUnique") - public R checkTypeNameUnique(@RequestParam String typeName, - @RequestParam(required = false) Long id) { + public R checkTypeNameUnique(@RequestParam("typeName") String typeName, + @RequestParam(value = "id", required = false) Long id) { return R.ok(scholarshipTypeService.checkTypeNameUnique(typeName, id)); } @@ -159,7 +159,7 @@ public class JcbtScholarshipTypeController extends BaseController { */ //@SaCheckPermission("jcbt:scholarshipType:query") @GetMapping("/getByCompatibilityType/{compatibilityType}") - public R> getByCompatibilityType(@PathVariable String compatibilityType) { + public R> getByCompatibilityType(@PathVariable("compatibilityType") String compatibilityType) { return R.ok(scholarshipTypeService.queryByCompatibilityType(compatibilityType)); } @@ -169,7 +169,7 @@ public class JcbtScholarshipTypeController extends BaseController { //@SaCheckPermission("jcbt:scholarshipType:edit") @Log(title = "奖学金类型", businessType = BusinessType.UPDATE) @PutMapping("/changeStatus") - public R changeStatus(@RequestParam Long id, @RequestParam Integer status) { + public R changeStatus(@RequestParam("id") Long id, @RequestParam("status") Integer status) { return toAjax(scholarshipTypeService.changeStatus(id, status)); } @@ -187,7 +187,7 @@ public class JcbtScholarshipTypeController extends BaseController { */ //@SaCheckPermission("jcbt:scholarshipType:compatibility") @GetMapping("/{id}/compatibility") - public R> getCompatibilityConfig(@NotNull(message = "主键不能为空") @PathVariable Long id) { + public R> getCompatibilityConfig(@NotNull(message = "主键不能为空") @PathVariable("id") Long id) { // 获取所有启用的奖学金类型(除了当前奖学金) List allTypes = scholarshipTypeService.queryActiveTypes() .stream() @@ -227,7 +227,7 @@ public class JcbtScholarshipTypeController extends BaseController { //@SaCheckPermission("jcbt:scholarshipType:compatibility") @Log(title = "奖学金兼得关系配置", businessType = BusinessType.UPDATE) @PostMapping("/{id}/compatibility") - public R saveCompatibilityConfig(@NotNull(message = "主键不能为空") @PathVariable Long id, + public R saveCompatibilityConfig(@NotNull(message = "主键不能为空") @PathVariable("id") Long id, @RequestBody Map config) { // 安全地转换互斥类型ID列表,支持前端传递的字符串或数字类型 @SuppressWarnings("unchecked") @@ -272,7 +272,7 @@ public class JcbtScholarshipTypeController extends BaseController { */ //@SaCheckPermission("jcbt:scholarshipType:query") @GetMapping("/checkCompatibility") - public R checkCompatibility(@RequestParam Long typeId1, @RequestParam Long typeId2) { + public R checkCompatibility(@RequestParam("typeId1") Long typeId1, @RequestParam("typeId2") Long typeId2) { return R.ok(compatibilityService.checkCompatibility(typeId1, typeId2)); } @@ -281,7 +281,7 @@ public class JcbtScholarshipTypeController extends BaseController { */ //@SaCheckPermission("jcbt:scholarshipType:query") @GetMapping("/{id}/compatibleTypes") - public R> getCompatibleTypes(@NotNull(message = "主键不能为空") @PathVariable Long id) { + public R> getCompatibleTypes(@NotNull(message = "主键不能为空") @PathVariable("id") Long id) { List compatibleTypeIds = compatibilityService.getCompatibleTypeIds(id); List compatibleTypes = new ArrayList<>(); @@ -300,7 +300,7 @@ public class JcbtScholarshipTypeController extends BaseController { */ //@SaCheckPermission("jcbt:scholarshipType:query") @GetMapping("/{id}/exclusiveRelationDisplay") - public R getExclusiveRelationDisplay(@NotNull(message = "主键不能为空") @PathVariable Long id) { + public R getExclusiveRelationDisplay(@NotNull(message = "主键不能为空") @PathVariable("id") Long id) { return R.ok(scholarshipTypeService.getExclusiveRelationDisplay(id)); } diff --git a/backend/ruoyi-modules/ruoyi-jcbt/src/main/java/org/dromara/jcbt/controller/JcbtWorkStudyApplicationCollegeReviewController.java b/backend/ruoyi-modules/ruoyi-jcbt/src/main/java/org/dromara/jcbt/controller/JcbtWorkStudyApplicationCollegeReviewController.java index 29cb4678..cbb99640 100644 --- a/backend/ruoyi-modules/ruoyi-jcbt/src/main/java/org/dromara/jcbt/controller/JcbtWorkStudyApplicationCollegeReviewController.java +++ b/backend/ruoyi-modules/ruoyi-jcbt/src/main/java/org/dromara/jcbt/controller/JcbtWorkStudyApplicationCollegeReviewController.java @@ -110,7 +110,7 @@ public class JcbtWorkStudyApplicationCollegeReviewController extends BaseControl @Operation(summary = "获取本学院申请详情") //@SaCheckPermission("jcbt:workStudyApplication:collegeReview") @GetMapping("/{id}") - public R getInfo(@PathVariable Long id) { + public R getInfo(@PathVariable("id") Long id) { // 获取申请信息 JcbtWorkStudyApplicationVo vo = workStudyApplicationService.queryById(id); if (vo == null) { @@ -174,7 +174,7 @@ public class JcbtWorkStudyApplicationCollegeReviewController extends BaseControl public R batchReview( @Parameter(description = "申请ID列表") @RequestBody @NotEmpty(message = "申请ID不能为空") Collection ids, @Parameter(description = "审核结果") @RequestParam @NotNull(message = "审核结果不能为空") String reviewResult, - @Parameter(description = "审核意见") @RequestParam String reviewComment) { + @Parameter(description = "审核意见") @RequestParam("reviewComment") String reviewComment) { // 权限检查:批量审核前检查所有申请是否属于当前用户学院 Long currentUserCollegeId = getCurrentUserCollegeIdAsLong(); diff --git a/backend/ruoyi-modules/ruoyi-jcbt/src/main/java/org/dromara/jcbt/controller/JcbtWorkStudyApplicationController.java b/backend/ruoyi-modules/ruoyi-jcbt/src/main/java/org/dromara/jcbt/controller/JcbtWorkStudyApplicationController.java index 6a88d7ca..4baf4794 100644 --- a/backend/ruoyi-modules/ruoyi-jcbt/src/main/java/org/dromara/jcbt/controller/JcbtWorkStudyApplicationController.java +++ b/backend/ruoyi-modules/ruoyi-jcbt/src/main/java/org/dromara/jcbt/controller/JcbtWorkStudyApplicationController.java @@ -69,7 +69,7 @@ public class JcbtWorkStudyApplicationController extends BaseController { @Operation(summary = "获取勤工俭学申请信息详细信息") // @SaCheckPermission("jcbt:workStudyApplication:query") // 暂时注释权限检查,用于测试 @GetMapping("/detail/{id}") - public R getInfo(@NotNull(message = "主键不能为空") @PathVariable Long id) { + public R getInfo(@NotNull(message = "主键不能为空") @PathVariable("id") Long id) { return R.ok(workStudyApplicationService.queryById(id)); } @@ -104,7 +104,7 @@ public class JcbtWorkStudyApplicationController extends BaseController { //@SaCheckPermission("jcbt:workStudyApplication:remove") @Log(title = "勤工俭学申请信息", businessType = BusinessType.DELETE) @DeleteMapping("/{ids}") - public R remove(@NotEmpty(message = "主键不能为空") @PathVariable Long[] ids) { + public R remove(@NotEmpty(message = "主键不能为空") @PathVariable("ids") Long[] ids) { return toAjax(workStudyApplicationService.deleteWithValidByIds(List.of(ids), true)); } @@ -124,7 +124,7 @@ public class JcbtWorkStudyApplicationController extends BaseController { * 临时调试接口 - 直接查询数据库记录 */ @GetMapping("/debug/{id}") - public R> debugQuery(@PathVariable Long id) { + public R> debugQuery(@PathVariable("id") Long id) { log.info("调试查询接口,ID: {}", id); Map result = new HashMap<>(); @@ -203,7 +203,7 @@ public class JcbtWorkStudyApplicationController extends BaseController { @Operation(summary = "获取岗位申请统计信息") //@SaCheckPermission("jcbt:workStudyApplication:statistics") @GetMapping("/statistics/{positionId}") - public R> getStatistics(@PathVariable Long positionId) { + public R> getStatistics(@PathVariable("positionId") Long positionId) { return R.ok(workStudyApplicationService.getPositionApplicationStatistics(positionId)); } @@ -216,7 +216,7 @@ public class JcbtWorkStudyApplicationController extends BaseController { //@SaCheckPermission("jcbt:workStudyApplication:submit") @Log(title = "勤工俭学申请", businessType = BusinessType.UPDATE) @PostMapping("/submit/{id}") - public R submitApplication(@PathVariable Long id) { + public R submitApplication(@PathVariable("id") Long id) { return toAjax(workStudyApplicationService.submitApplication(id)); } @@ -227,7 +227,7 @@ public class JcbtWorkStudyApplicationController extends BaseController { //@SaCheckPermission("jcbt:workStudyApplication:cancel") @Log(title = "勤工俭学申请", businessType = BusinessType.UPDATE) @PostMapping("/cancel/{id}") - public R cancelApplication(@PathVariable Long id) { + public R cancelApplication(@PathVariable("id") Long id) { return toAjax(workStudyApplicationService.cancelApplication(id)); } @@ -263,7 +263,7 @@ public class JcbtWorkStudyApplicationController extends BaseController { public R batchCollegeReview( @RequestParam @NotEmpty(message = "申请ID不能为空") List ids, @RequestParam @NotNull(message = "审核结果不能为空") String reviewResult, - @RequestParam(required = false) String reviewComment) { + @RequestParam(value = "reviewComment", required = false) String reviewComment) { return toAjax(workStudyApplicationService.batchCollegeReview(ids, reviewResult, reviewComment)); } @@ -277,7 +277,7 @@ public class JcbtWorkStudyApplicationController extends BaseController { public R batchFinalReview( @RequestParam @NotEmpty(message = "申请ID不能为空") List ids, @RequestParam @NotNull(message = "审核结果不能为空") String reviewResult, - @RequestParam(required = false) String reviewComment) { + @RequestParam(value = "reviewComment", required = false) String reviewComment) { return toAjax(workStudyApplicationService.batchFinalReview(ids, reviewResult, reviewComment)); } @@ -291,7 +291,7 @@ public class JcbtWorkStudyApplicationController extends BaseController { @Operation(summary = "检查学生是否已申请该岗位") //@SaCheckPermission("jcbt:workStudyApplication:check") @GetMapping("/hasApplied") - public R hasApplied(@RequestParam Long studentId, @RequestParam Long positionId) { + public R hasApplied(@RequestParam("studentId") Long studentId, @RequestParam("positionId") Long positionId) { return R.ok(workStudyApplicationService.hasApplied(studentId, positionId)); } diff --git a/backend/ruoyi-modules/ruoyi-jcbt/src/main/java/org/dromara/jcbt/controller/JcbtWorkStudyApplicationStudentAffairsReviewController.java b/backend/ruoyi-modules/ruoyi-jcbt/src/main/java/org/dromara/jcbt/controller/JcbtWorkStudyApplicationStudentAffairsReviewController.java index 7cbb48f8..f3d64761 100644 --- a/backend/ruoyi-modules/ruoyi-jcbt/src/main/java/org/dromara/jcbt/controller/JcbtWorkStudyApplicationStudentAffairsReviewController.java +++ b/backend/ruoyi-modules/ruoyi-jcbt/src/main/java/org/dromara/jcbt/controller/JcbtWorkStudyApplicationStudentAffairsReviewController.java @@ -84,7 +84,7 @@ public class JcbtWorkStudyApplicationStudentAffairsReviewController extends Base @Operation(summary = "获取勤工俭学申请详情") //@SaCheckPermission("jcbt:workStudyApplication:studentAffairsReview") @GetMapping("/{id}") - public R getInfo(@Parameter(description = "主键") @PathVariable Long id) { + public R getInfo(@Parameter(description = "主键") @PathVariable("id") Long id) { JcbtWorkStudyApplicationVo vo = workStudyApplicationService.queryById(id); if (vo == null) { return R.fail("申请不存在"); @@ -143,7 +143,7 @@ public class JcbtWorkStudyApplicationStudentAffairsReviewController extends Base public R batchReview( @Parameter(description = "申请ID集合") @RequestParam @NotEmpty List ids, @Parameter(description = "审核结果") @RequestParam @NotNull String reviewResult, - @Parameter(description = "审核意见") @RequestParam String reviewComment) { + @Parameter(description = "审核意见") @RequestParam("reviewComment") String reviewComment) { // 验证审核结果 if (!"APPROVED".equals(reviewResult) && !"REJECTED".equals(reviewResult)) { diff --git a/backend/ruoyi-modules/ruoyi-jcbt/src/main/java/org/dromara/jcbt/controller/JcbtWorkStudyPositionController.java b/backend/ruoyi-modules/ruoyi-jcbt/src/main/java/org/dromara/jcbt/controller/JcbtWorkStudyPositionController.java index 6aa497e5..7089bc09 100644 --- a/backend/ruoyi-modules/ruoyi-jcbt/src/main/java/org/dromara/jcbt/controller/JcbtWorkStudyPositionController.java +++ b/backend/ruoyi-modules/ruoyi-jcbt/src/main/java/org/dromara/jcbt/controller/JcbtWorkStudyPositionController.java @@ -72,7 +72,7 @@ public class JcbtWorkStudyPositionController extends BaseController { @GetMapping("/{id}") public R getInfo(@NotNull(message = "主键不能为空") @Parameter(description = "岗位ID", required = true) - @PathVariable Long id) { + @PathVariable("id") Long id) { return R.ok(workStudyPositionService.queryById(id)); } @@ -84,7 +84,7 @@ public class JcbtWorkStudyPositionController extends BaseController { @GetMapping("/{id}/withApplicationStatus") public R> getPositionWithApplicationStatus(@NotNull(message = "主键不能为空") @Parameter(description = "岗位ID", required = true) - @PathVariable Long id) { + @PathVariable("id") Long id) { // 获取岗位详情 JcbtWorkStudyPositionVo position = workStudyPositionService.queryById(id); if (position == null) { @@ -137,7 +137,7 @@ public class JcbtWorkStudyPositionController extends BaseController { @DeleteMapping("/{ids}") public R remove(@NotEmpty(message = "主键不能为空") @Parameter(description = "岗位ID列表", required = true) - @PathVariable Long[] ids) { + @PathVariable("ids") Long[] ids) { return toAjax(workStudyPositionService.deleteWithValidByIds(List.of(ids), true)); } @@ -212,7 +212,7 @@ public class JcbtWorkStudyPositionController extends BaseController { @GetMapping("/checkAvailable/{id}") public R checkAvailable(@NotNull(message = "主键不能为空") @Parameter(description = "岗位ID", required = true) - @PathVariable Long id) { + @PathVariable("id") Long id) { return R.ok(workStudyPositionService.checkPositionAvailable(id)); } @@ -222,7 +222,7 @@ public class JcbtWorkStudyPositionController extends BaseController { @Operation(summary = "岗位统计") //@SaCheckPermission("jcbt:workStudyPosition:statistics") @GetMapping("/statistics") - public R> statistics(@Parameter(description = "学院ID") @RequestParam(required = false) Long collegeId) { + public R> statistics(@Parameter(description = "学院ID") @RequestParam(value = "collegeId", required = false) Long collegeId) { return R.ok(workStudyPositionService.getPositionStatistics(collegeId)); } @@ -237,7 +237,7 @@ public class JcbtWorkStudyPositionController extends BaseController { @PutMapping("/publish/{id}") public R publish(@NotNull(message = "主键不能为空") @Parameter(description = "岗位ID", required = true) - @PathVariable Long id) { + @PathVariable("id") Long id) { return toAjax(workStudyPositionService.publishPosition(id)); } @@ -250,7 +250,7 @@ public class JcbtWorkStudyPositionController extends BaseController { @PutMapping("/startRecruiting/{id}") public R startRecruiting(@NotNull(message = "主键不能为空") @Parameter(description = "岗位ID", required = true) - @PathVariable Long id) { + @PathVariable("id") Long id) { return toAjax(workStudyPositionService.startRecruiting(id)); } @@ -263,7 +263,7 @@ public class JcbtWorkStudyPositionController extends BaseController { @PutMapping("/suspend/{id}") public R suspend(@NotNull(message = "主键不能为空") @Parameter(description = "岗位ID", required = true) - @PathVariable Long id) { + @PathVariable("id") Long id) { return toAjax(workStudyPositionService.suspendPosition(id)); } @@ -276,7 +276,7 @@ public class JcbtWorkStudyPositionController extends BaseController { @PutMapping("/cancel/{id}") public R cancel(@NotNull(message = "主键不能为空") @Parameter(description = "岗位ID", required = true) - @PathVariable Long id) { + @PathVariable("id") Long id) { return toAjax(workStudyPositionService.cancelPosition(id)); } @@ -298,7 +298,7 @@ public class JcbtWorkStudyPositionController extends BaseController { @Operation(summary = "按状态分组统计") //@SaCheckPermission("jcbt:workStudyPosition:countByStatus") @GetMapping("/countByStatus") - public R>> countByStatus(@Parameter(description = "学院ID") @RequestParam(required = false) Long collegeId) { + public R>> countByStatus(@Parameter(description = "学院ID") @RequestParam(value = "collegeId", required = false) Long collegeId) { return R.ok(workStudyPositionService.countByStatus(collegeId)); } @@ -343,7 +343,7 @@ public class JcbtWorkStudyPositionController extends BaseController { @Operation(summary = "根据状态查询岗位") //@SaCheckPermission("jcbt:workStudyPosition:queryByStatus") @GetMapping("/queryByStatus") - public TableDataInfo queryByStatus(@RequestParam String status, PageQuery pageQuery) { + public TableDataInfo queryByStatus(@RequestParam("status") String status, PageQuery pageQuery) { return workStudyPositionService.queryByStatus(status, pageQuery); } @@ -353,7 +353,7 @@ public class JcbtWorkStudyPositionController extends BaseController { @Operation(summary = "根据发布范围查询岗位") //@SaCheckPermission("jcbt:workStudyPosition:queryByScope") @GetMapping("/queryByScope") - public TableDataInfo queryByScope(@RequestParam String positionScope, PageQuery pageQuery) { + public TableDataInfo queryByScope(@RequestParam("positionScope") String positionScope, PageQuery pageQuery) { return workStudyPositionService.queryByPositionScope(positionScope, pageQuery); } diff --git a/backend/ruoyi-modules/ruoyi-rs/src/main/java/org/dromara/rs/controller/RsApplicationController.java b/backend/ruoyi-modules/ruoyi-rs/src/main/java/org/dromara/rs/controller/RsApplicationController.java index 05e3f256..4631d49b 100644 --- a/backend/ruoyi-modules/ruoyi-rs/src/main/java/org/dromara/rs/controller/RsApplicationController.java +++ b/backend/ruoyi-modules/ruoyi-rs/src/main/java/org/dromara/rs/controller/RsApplicationController.java @@ -194,7 +194,7 @@ public class RsApplicationController extends BaseController { @SaCheckPermission("rs:application:edit") @Log(title = "上传应聘附件", businessType = BusinessType.UPDATE) @PostMapping("/attachment/{applicationId}") - public R> uploadAttachment(@PathVariable Long applicationId, @RequestParam("file") MultipartFile file) throws IOException { + public R> uploadAttachment(@PathVariable("applicationId") Long applicationId, @RequestParam("file") MultipartFile file) throws IOException { if (file.isEmpty()) { return R.fail("上传失败,请选择文件"); } @@ -343,7 +343,7 @@ public class RsApplicationController extends BaseController { @SaCheckPermission("rs:application:remove") @Log(title = "应聘申请", businessType = BusinessType.DELETE) @DeleteMapping("/{applicationIds}") - public R remove(@PathVariable Long[] applicationIds) { + public R remove(@PathVariable("applicationIds") Long[] applicationIds) { return toAjax(applicationService.deleteRsApplicationByIds(applicationIds)); } } \ No newline at end of file diff --git a/backend/ruoyi-modules/ruoyi-rs/src/main/java/org/dromara/rs/controller/RsJobController.java b/backend/ruoyi-modules/ruoyi-rs/src/main/java/org/dromara/rs/controller/RsJobController.java index f8df61c8..6db93a1c 100644 --- a/backend/ruoyi-modules/ruoyi-rs/src/main/java/org/dromara/rs/controller/RsJobController.java +++ b/backend/ruoyi-modules/ruoyi-rs/src/main/java/org/dromara/rs/controller/RsJobController.java @@ -131,7 +131,7 @@ public class RsJobController extends BaseController { @SaCheckPermission("rs:job:edit") @Log(title = "切换职位状态", businessType = BusinessType.UPDATE) @PutMapping("/toggle/{jobId}") - public R toggleStatus(@PathVariable Long jobId) { + public R toggleStatus(@PathVariable("jobId") Long jobId) { RsJobVo job = jobService.selectRsJobById(jobId); if (job == null) { return R.fail("职位不存在"); @@ -156,7 +156,7 @@ public class RsJobController extends BaseController { @SaIgnore @Log(title = "增加岗位浏览次数", businessType = BusinessType.UPDATE) @PostMapping("/view/{jobId}") - public R incrementViewCount(@PathVariable Long jobId) { + public R incrementViewCount(@PathVariable("jobId") Long jobId) { return toAjax(jobService.incrementViewCount(jobId)); } @@ -166,7 +166,7 @@ public class RsJobController extends BaseController { @SaCheckPermission("rs:job:remove") @Log(title = "招聘职位", businessType = BusinessType.DELETE) @DeleteMapping("/{jobIds}") - public R remove(@PathVariable Long[] jobIds) { + public R remove(@PathVariable("jobIds") Long[] jobIds) { return toAjax(jobService.deleteRsJobByIds(jobIds)); } } \ No newline at end of file diff --git a/backend/ruoyi-modules/ruoyi-rs/src/main/java/org/dromara/rs/controller/RsOverseasApplicationAttachmentController.java b/backend/ruoyi-modules/ruoyi-rs/src/main/java/org/dromara/rs/controller/RsOverseasApplicationAttachmentController.java index e6ea829f..854293e7 100644 --- a/backend/ruoyi-modules/ruoyi-rs/src/main/java/org/dromara/rs/controller/RsOverseasApplicationAttachmentController.java +++ b/backend/ruoyi-modules/ruoyi-rs/src/main/java/org/dromara/rs/controller/RsOverseasApplicationAttachmentController.java @@ -38,7 +38,7 @@ public class RsOverseasApplicationAttachmentController extends BaseController { @SaCheckPermission("rs:overseas:query") @GetMapping("/list/{applicationId}") public R> list( - @NotNull(message = "申请ID不能为空") @PathVariable Long applicationId) { + @NotNull(message = "申请ID不能为空") @PathVariable("applicationId") Long applicationId) { List list = attachmentService.selectAttachmentList(applicationId); return R.ok(list); } @@ -49,7 +49,7 @@ public class RsOverseasApplicationAttachmentController extends BaseController { @SaCheckPermission("rs:overseas:query") @GetMapping("/{attachmentId}") public R getInfo( - @NotNull(message = "附件ID不能为空") @PathVariable Long attachmentId) { + @NotNull(message = "附件ID不能为空") @PathVariable("attachmentId") Long attachmentId) { RsOverseasApplicationAttachmentVo vo = attachmentService.selectAttachmentById(attachmentId); return R.ok(vo); } @@ -66,9 +66,9 @@ public class RsOverseasApplicationAttachmentController extends BaseController { @Log(title = "上传出国申请附件", businessType = BusinessType.INSERT) @PostMapping("/upload") public R upload( - @NotNull(message = "申请ID不能为空") @RequestParam Long applicationId, - @RequestParam String title, - @RequestParam(required = false) String content, + @NotNull(message = "申请ID不能为空") @RequestParam("applicationId") Long applicationId, + @RequestParam("title") String title, + @RequestParam(value = "content", required = false) String content, @RequestParam("file") MultipartFile file) { try { RsOverseasApplicationAttachmentVo vo = attachmentService.uploadAttachment( @@ -97,7 +97,7 @@ public class RsOverseasApplicationAttachmentController extends BaseController { @SaCheckPermission("rs:overseas:remove") @Log(title = "删除出国申请附件", businessType = BusinessType.DELETE) @DeleteMapping("/{attachmentId}") - public R remove(@NotNull(message = "附件ID不能为空") @PathVariable Long attachmentId) { + public R remove(@NotNull(message = "附件ID不能为空") @PathVariable("attachmentId") Long attachmentId) { boolean success = attachmentService.deleteAttachment(attachmentId); return toAjax(success); } diff --git a/backend/ruoyi-modules/ruoyi-rs/src/main/java/org/dromara/rs/controller/RsOverseasApplicationController.java b/backend/ruoyi-modules/ruoyi-rs/src/main/java/org/dromara/rs/controller/RsOverseasApplicationController.java index 868181ae..ac89c1ee 100644 --- a/backend/ruoyi-modules/ruoyi-rs/src/main/java/org/dromara/rs/controller/RsOverseasApplicationController.java +++ b/backend/ruoyi-modules/ruoyi-rs/src/main/java/org/dromara/rs/controller/RsOverseasApplicationController.java @@ -150,7 +150,7 @@ public class RsOverseasApplicationController extends BaseController { */ // @SaCheckPermission("rs:overseas:list") @GetMapping("/status/{status}") - public R> listByStatus(@PathVariable String status) { + public R> listByStatus(@PathVariable("status") String status) { List list = applicationService.queryByStatus(status); return R.ok(list); } @@ -179,7 +179,7 @@ public class RsOverseasApplicationController extends BaseController { */ // @SaCheckPermission("rs:overseas:query") @GetMapping("/detail/{applicationId}") - public R getInfo(@NotNull(message = "主键不能为空") @PathVariable Long applicationId) { + public R getInfo(@NotNull(message = "主键不能为空") @PathVariable("applicationId") Long applicationId) { return R.ok(applicationService.queryById(applicationId)); } @@ -188,7 +188,7 @@ public class RsOverseasApplicationController extends BaseController { */ // @SaCheckPermission("rs:overseas:query") @GetMapping("/dept-approver/{applicationId}") - public R getDepartmentApproverId(@PathVariable Long applicationId) { + public R getDepartmentApproverId(@PathVariable("applicationId") Long applicationId) { RsOverseasApplicationVo application = applicationService.queryById(applicationId); if (application == null) { return R.fail("申请不存在"); @@ -263,7 +263,7 @@ public class RsOverseasApplicationController extends BaseController { // @SaCheckPermission("rs:overseas:submit") @Log(title = "提交出国申请", businessType = BusinessType.UPDATE) @PutMapping("/submit/{applicationId}") - public R submit(@NotNull(message = "申请ID不能为空") @PathVariable Long applicationId) { + public R submit(@NotNull(message = "申请ID不能为空") @PathVariable("applicationId") Long applicationId) { // 获取申请详情进行校验 RsOverseasApplicationVo application = applicationService.queryById(applicationId); if (application == null) { @@ -295,7 +295,7 @@ public class RsOverseasApplicationController extends BaseController { // @SaCheckPermission("rs:overseas:edit") @Log(title = "重新提交出国申请", businessType = BusinessType.UPDATE) @PutMapping("/resubmit/{applicationId}") - public R resubmit(@NotNull(message = "申请ID不能为空") @PathVariable Long applicationId, + public R resubmit(@NotNull(message = "申请ID不能为空") @PathVariable("applicationId") Long applicationId, @Validated @RequestBody RsOverseasApplicationBo bo) { return toAjax(applicationService.resubmitApplication(applicationId, bo)); } @@ -307,8 +307,8 @@ public class RsOverseasApplicationController extends BaseController { // @SaCheckPermission("rs:overseas:query") @GetMapping("/validatePrerequisites") public R> validatePrerequisites( - @RequestParam(required = false) String politicalStatus, - @RequestParam(required = false) Integer duration) { + @RequestParam(value = "politicalStatus", required = false) String politicalStatus, + @RequestParam(value = "duration", required = false) Integer duration) { Long applicantId = LoginHelper.getUserId(); java.util.Map result = new java.util.HashMap<>(); @@ -327,8 +327,8 @@ public class RsOverseasApplicationController extends BaseController { // @SaCheckPermission("rs:overseas:cancel") @Log(title = "取消出国申请", businessType = BusinessType.UPDATE) @PutMapping("/cancel/{applicationId}") - public R cancel(@NotNull(message = "申请ID不能为空") @PathVariable Long applicationId, - @RequestParam(required = false) String reason) { + public R cancel(@NotNull(message = "申请ID不能为空") @PathVariable("applicationId") Long applicationId, + @RequestParam(value = "reason", required = false) String reason) { return toAjax(applicationService.cancelApplication(applicationId, reason)); } @@ -366,7 +366,7 @@ public class RsOverseasApplicationController extends BaseController { // @SaCheckPermission("rs:overseas:remove") @Log(title = "出国申请", businessType = BusinessType.DELETE) @DeleteMapping("/{applicationIds}") - public R remove(@NotEmpty(message = "主键集合不能为空") @PathVariable List applicationIds) { + public R remove(@NotEmpty(message = "主键集合不能为空") @PathVariable("applicationIds") List applicationIds) { return toAjax(applicationService.deleteWithValidByIds(applicationIds, true)); } @@ -465,7 +465,7 @@ public class RsOverseasApplicationController extends BaseController { */ // @SaCheckPermission("rs:overseas:download") @GetMapping("/downloadPdf/{documentId}") - public void downloadPdf(@PathVariable String documentId, HttpServletResponse response) { + public void downloadPdf(@PathVariable("documentId") String documentId, HttpServletResponse response) { registrationFormService.downloadPdf(documentId, response); } @@ -474,7 +474,7 @@ public class RsOverseasApplicationController extends BaseController { */ // @SaCheckPermission("rs:overseas:preview") @GetMapping("/previewPdf/{documentId}") - public void previewPdf(@PathVariable String documentId, HttpServletResponse response) { + public void previewPdf(@PathVariable("documentId") String documentId, HttpServletResponse response) { registrationFormService.downloadPdf(documentId, response); } @@ -487,7 +487,7 @@ public class RsOverseasApplicationController extends BaseController { */ // @SaCheckPermission("rs:overseas:list") @GetMapping("/getDepartmentApproverByApplicant/{applicantId}") - public R getDepartmentApproverByApplicant(@PathVariable Long applicantId) { + public R getDepartmentApproverByApplicant(@PathVariable("applicantId") Long applicantId) { Long departmentApproverId = applicationService.getDepartmentApproverId(applicantId); return R.ok(departmentApproverId); } @@ -499,7 +499,7 @@ public class RsOverseasApplicationController extends BaseController { */ // @SaCheckPermission("rs:overseas:list") @GetMapping("/getHrApprovers/{applicantId}") - public R> getHrApprovers(@PathVariable Long applicantId) { + public R> getHrApprovers(@PathVariable("applicantId") Long applicantId) { List hrApprovers = applicationService.getHrApprovers(applicantId); return R.ok(hrApprovers); } @@ -554,7 +554,7 @@ public class RsOverseasApplicationController extends BaseController { */ // @SaCheckPermission("rs:overseas:query") @GetMapping("/downloadStampedFile/{applicationId}") - public void downloadStampedFile(@PathVariable Long applicationId, HttpServletResponse response) { + public void downloadStampedFile(@PathVariable("applicationId") Long applicationId, HttpServletResponse response) { try { RsOverseasApplicationVo application = applicationService.queryById(applicationId); if (application == null || application.getStampedFileOssId() == null) { @@ -621,7 +621,7 @@ public class RsOverseasApplicationController extends BaseController { */ // @SaCheckPermission("rs:overseas:query") @GetMapping("/downloadPartyRetentionFile/{applicationId}") - public void downloadPartyRetentionFile(@PathVariable Long applicationId, HttpServletResponse response) { + public void downloadPartyRetentionFile(@PathVariable("applicationId") Long applicationId, HttpServletResponse response) { try { RsOverseasApplicationVo application = applicationService.queryById(applicationId); if (application == null || application.getPartyRetentionFileOssId() == null) { diff --git a/backend/ruoyi-modules/ruoyi-rs/src/main/java/org/dromara/rs/controller/RsOverseasApprovalController.java b/backend/ruoyi-modules/ruoyi-rs/src/main/java/org/dromara/rs/controller/RsOverseasApprovalController.java index 9ad65e6e..3fd60a7d 100644 --- a/backend/ruoyi-modules/ruoyi-rs/src/main/java/org/dromara/rs/controller/RsOverseasApprovalController.java +++ b/backend/ruoyi-modules/ruoyi-rs/src/main/java/org/dromara/rs/controller/RsOverseasApprovalController.java @@ -117,7 +117,7 @@ public class RsOverseasApprovalController extends BaseController { */ // @SaCheckPermission("rs:overseas:query") @GetMapping("/application/{applicationId}") - public R> getByApplicationId(@PathVariable Long applicationId) { + public R> getByApplicationId(@PathVariable("applicationId") Long applicationId) { List list = approvalService.queryByApplicationId(applicationId); return R.ok(list); } @@ -138,7 +138,7 @@ public class RsOverseasApprovalController extends BaseController { */ // @SaCheckPermission("rs:overseas:query") @GetMapping("/{approvalId}") - public R getInfo(@NotNull(message = "主键不能为空") @PathVariable Long approvalId) { + public R getInfo(@NotNull(message = "主键不能为空") @PathVariable("approvalId") Long approvalId) { return R.ok(approvalService.queryById(approvalId)); } @@ -171,7 +171,7 @@ public class RsOverseasApprovalController extends BaseController { // @SaCheckPermission("rs:overseas:remove") @Log(title = "出国审批记录", businessType = BusinessType.DELETE) @DeleteMapping("/{approvalIds}") - public R remove(@NotEmpty(message = "主键集合不能为空") @PathVariable List approvalIds) { + public R remove(@NotEmpty(message = "主键集合不能为空") @PathVariable("approvalIds") List approvalIds) { return toAjax(approvalService.deleteWithValidByIds(approvalIds, true)); } diff --git a/backend/ruoyi-modules/ruoyi-rs/src/main/java/org/dromara/rs/controller/RsOverseasItineraryChangeController.java b/backend/ruoyi-modules/ruoyi-rs/src/main/java/org/dromara/rs/controller/RsOverseasItineraryChangeController.java index a962ea88..6b41b9cb 100644 --- a/backend/ruoyi-modules/ruoyi-rs/src/main/java/org/dromara/rs/controller/RsOverseasItineraryChangeController.java +++ b/backend/ruoyi-modules/ruoyi-rs/src/main/java/org/dromara/rs/controller/RsOverseasItineraryChangeController.java @@ -76,7 +76,7 @@ public class RsOverseasItineraryChangeController extends BaseController { */ // @SaCheckPermission("rs:itineraryChange:query") @GetMapping("/{changeId}") - public R getInfo(@PathVariable Long changeId) { + public R getInfo(@PathVariable("changeId") Long changeId) { return R.ok(changeService.queryById(changeId)); } @@ -101,7 +101,7 @@ public class RsOverseasItineraryChangeController extends BaseController { */ // @SaCheckPermission("rs:itineraryChange:query") @GetMapping("/record/{recordId}") - public R getRecordInfo(@PathVariable Long recordId) { + public R getRecordInfo(@PathVariable("recordId") Long recordId) { return R.ok(recordService.queryById(recordId)); } @@ -132,7 +132,7 @@ public class RsOverseasItineraryChangeController extends BaseController { // @SaCheckPermission("rs:itineraryChange:remove") @Log(title = "行程变更申请", businessType = BusinessType.DELETE) @DeleteMapping("/{changeIds}") - public R remove(@NotEmpty(message = "主键不能为空") @PathVariable Long[] changeIds) { + public R remove(@NotEmpty(message = "主键不能为空") @PathVariable("changeIds") Long[] changeIds) { return toAjax(changeService.deleteByIds(List.of(changeIds))); } @@ -142,7 +142,7 @@ public class RsOverseasItineraryChangeController extends BaseController { // @SaCheckPermission("rs:itineraryChange:cancel") @Log(title = "行程变更申请", businessType = BusinessType.UPDATE) @PutMapping("/cancel/{changeId}") - public R cancel(@PathVariable Long changeId) { + public R cancel(@PathVariable("changeId") Long changeId) { return toAjax(changeService.cancelChange(changeId)); } @@ -177,7 +177,7 @@ public class RsOverseasItineraryChangeController extends BaseController { */ // @SaCheckPermission("rs:itineraryChange:query") @GetMapping("/record/{recordId}/history") - public R> getChangeHistory(@PathVariable Long recordId) { + public R> getChangeHistory(@PathVariable("recordId") Long recordId) { return R.ok(changeService.queryByRecordId(recordId)); } } diff --git a/backend/ruoyi-modules/ruoyi-rs/src/main/java/org/dromara/rs/controller/RsOverseasRecordController.java b/backend/ruoyi-modules/ruoyi-rs/src/main/java/org/dromara/rs/controller/RsOverseasRecordController.java index 04d808c0..b20fd7ef 100644 --- a/backend/ruoyi-modules/ruoyi-rs/src/main/java/org/dromara/rs/controller/RsOverseasRecordController.java +++ b/backend/ruoyi-modules/ruoyi-rs/src/main/java/org/dromara/rs/controller/RsOverseasRecordController.java @@ -88,7 +88,7 @@ public class RsOverseasRecordController extends BaseController { */ // @SaCheckPermission("rs:overseas:query") @GetMapping("/application/{applicationId}") - public R getByApplicationId(@PathVariable Long applicationId) { + public R getByApplicationId(@PathVariable("applicationId") Long applicationId) { RsOverseasRecordVo record = recordService.queryByApplicationId(applicationId); return R.ok(record); } @@ -120,7 +120,7 @@ public class RsOverseasRecordController extends BaseController { */ // @SaCheckPermission("rs:overseas:query") @GetMapping("/{recordId}") - public R getInfo(@NotNull(message = "主键不能为空") @PathVariable Long recordId) { + public R getInfo(@NotNull(message = "主键不能为空") @PathVariable("recordId") Long recordId) { return R.ok(recordService.queryById(recordId)); } @@ -150,7 +150,7 @@ public class RsOverseasRecordController extends BaseController { // @SaCheckPermission("rs:overseas:add") @Log(title = "创建出国记录", businessType = BusinessType.INSERT) @PostMapping("/create/{applicationId}") - public R createFromApplication(@NotNull(message = "申请ID不能为空") @PathVariable Long applicationId) { + public R createFromApplication(@NotNull(message = "申请ID不能为空") @PathVariable("applicationId") Long applicationId) { return toAjax(recordService.createRecordFromApplication(applicationId)); } @@ -172,7 +172,7 @@ public class RsOverseasRecordController extends BaseController { // @SaCheckPermission("rs:overseas:remove") @Log(title = "出国记录", businessType = BusinessType.DELETE) @DeleteMapping("/{recordIds}") - public R remove(@NotEmpty(message = "主键集合不能为空") @PathVariable List recordIds) { + public R remove(@NotEmpty(message = "主键集合不能为空") @PathVariable("recordIds") List recordIds) { return toAjax(recordService.deleteWithValidByIds(recordIds, true)); } @@ -182,7 +182,7 @@ public class RsOverseasRecordController extends BaseController { // @SaCheckPermission("rs:overseas:query") @Log(title = "下载出国情况回执", businessType = BusinessType.EXPORT) @GetMapping("/downloadReceipt/{recordId}") - public void downloadReceipt(@NotNull(message = "记录ID不能为空") @PathVariable Long recordId, + public void downloadReceipt(@NotNull(message = "记录ID不能为空") @PathVariable("recordId") Long recordId, HttpServletResponse response) { try { // 查询出国记录详情 diff --git a/backend/ruoyi-modules/ruoyi-rs/src/main/java/org/dromara/rs/controller/RsOverseasRegistrationController.java b/backend/ruoyi-modules/ruoyi-rs/src/main/java/org/dromara/rs/controller/RsOverseasRegistrationController.java index 0b7cb56b..f661ae7e 100644 --- a/backend/ruoyi-modules/ruoyi-rs/src/main/java/org/dromara/rs/controller/RsOverseasRegistrationController.java +++ b/backend/ruoyi-modules/ruoyi-rs/src/main/java/org/dromara/rs/controller/RsOverseasRegistrationController.java @@ -78,7 +78,7 @@ public class RsOverseasRegistrationController extends BaseController { */ // @SaCheckPermission("rs:overseasregistration:query") @GetMapping("/{registrationId}") - public R getInfo(@NotNull(message = "主键不能为空") @PathVariable Long registrationId) { + public R getInfo(@NotNull(message = "主键不能为空") @PathVariable("registrationId") Long registrationId) { return R.ok(registrationService.queryById(registrationId)); } @@ -88,7 +88,7 @@ public class RsOverseasRegistrationController extends BaseController { // @SaCheckPermission("rs:overseasregistration:query") @GetMapping("/application/{applicationId}") public R getByApplicationId( - @NotNull(message = "申请ID不能为空") @PathVariable Long applicationId) { + @NotNull(message = "申请ID不能为空") @PathVariable("applicationId") Long applicationId) { return R.ok(registrationService.queryByApplicationId(applicationId)); } @@ -128,7 +128,7 @@ public class RsOverseasRegistrationController extends BaseController { // @SaCheckPermission("rs:overseasregistration:remove") @Log(title = "出国登记", businessType = BusinessType.DELETE) @DeleteMapping("/{registrationIds}") - public R remove(@NotEmpty(message = "主键不能为空") @PathVariable Long[] registrationIds) { + public R remove(@NotEmpty(message = "主键不能为空") @PathVariable("registrationIds") Long[] registrationIds) { return toAjax(registrationService.deleteWithValidByIds(List.of(registrationIds), true)); } @@ -138,7 +138,7 @@ public class RsOverseasRegistrationController extends BaseController { // @SaCheckPermission("rs:overseasregistration:submit") @Log(title = "出国登记", businessType = BusinessType.UPDATE) @PutMapping("/submit/{registrationId}") - public R submit(@NotNull(message = "主键不能为空") @PathVariable Long registrationId) { + public R submit(@NotNull(message = "主键不能为空") @PathVariable("registrationId") Long registrationId) { return toAjax(registrationService.submitRegistration(registrationId)); } @@ -148,7 +148,7 @@ public class RsOverseasRegistrationController extends BaseController { // @SaCheckPermission("rs:overseasregistration:confirm") @Log(title = "出国登记", businessType = BusinessType.UPDATE) @PutMapping("/confirm/{registrationId}") - public R confirm(@NotNull(message = "主键不能为空") @PathVariable Long registrationId) { + public R confirm(@NotNull(message = "主键不能为空") @PathVariable("registrationId") Long registrationId) { return toAjax(registrationService.confirmRegistration(registrationId)); } @@ -158,7 +158,7 @@ public class RsOverseasRegistrationController extends BaseController { // @SaCheckPermission("rs:overseasregistration:withdraw") @Log(title = "出国登记", businessType = BusinessType.UPDATE) @PutMapping("/withdraw/{registrationId}") - public R withdraw(@NotNull(message = "主键不能为空") @PathVariable Long registrationId) { + public R withdraw(@NotNull(message = "主键不能为空") @PathVariable("registrationId") Long registrationId) { return toAjax(registrationService.withdrawRegistration(registrationId)); } @@ -168,7 +168,7 @@ public class RsOverseasRegistrationController extends BaseController { // @SaCheckPermission("rs:overseasregistration:create") @Log(title = "出国登记", businessType = BusinessType.INSERT) @PostMapping("/create/{applicationId}") - public R createFromApplication(@NotNull(message = "申请ID不能为空") @PathVariable Long applicationId) { + public R createFromApplication(@NotNull(message = "申请ID不能为空") @PathVariable("applicationId") Long applicationId) { return toAjax(registrationService.createFromApplication(applicationId)); } @@ -178,7 +178,7 @@ public class RsOverseasRegistrationController extends BaseController { // @SaCheckPermission("rs:registration:approve") @Log(title = "出国登记", businessType = BusinessType.UPDATE) @PutMapping("/approve/{registrationId}") - public R approve(@NotNull(message = "主键不能为空") @PathVariable Long registrationId, + public R approve(@NotNull(message = "主键不能为空") @PathVariable("registrationId") Long registrationId, @RequestBody(required = false) RsOverseasRegistrationBo bo) { String approveNotes = (bo != null && bo.getRemarks() != null) ? bo.getRemarks() : "同意"; return toAjax(registrationService.approveRegistration(registrationId, approveNotes)); @@ -190,7 +190,7 @@ public class RsOverseasRegistrationController extends BaseController { // @SaCheckPermission("rs:registration:reject") @Log(title = "出国登记", businessType = BusinessType.UPDATE) @PutMapping("/reject/{registrationId}") - public R reject(@NotNull(message = "主键不能为空") @PathVariable Long registrationId, + public R reject(@NotNull(message = "主键不能为空") @PathVariable("registrationId") Long registrationId, @RequestBody(required = false) RsOverseasRegistrationBo bo) { String rejectReason = (bo != null && bo.getRemarks() != null) ? bo.getRemarks() : "不同意"; return toAjax(registrationService.rejectRegistration(registrationId, rejectReason)); diff --git a/backend/ruoyi-modules/ruoyi-rs/src/main/java/org/dromara/rs/controller/RsStaffInfoController.java b/backend/ruoyi-modules/ruoyi-rs/src/main/java/org/dromara/rs/controller/RsStaffInfoController.java index 84f8b0be..eb4b5a53 100644 --- a/backend/ruoyi-modules/ruoyi-rs/src/main/java/org/dromara/rs/controller/RsStaffInfoController.java +++ b/backend/ruoyi-modules/ruoyi-rs/src/main/java/org/dromara/rs/controller/RsStaffInfoController.java @@ -147,7 +147,7 @@ public class RsStaffInfoController extends BaseController { */ // @SaCheckPermission("rs:staffInfo:query") @GetMapping("/{id}") - public R getInfo(@NotNull(message = "主键不能为空") @PathVariable Long id) { + public R getInfo(@NotNull(message = "主键不能为空") @PathVariable("id") Long id) { return R.ok(staffInfoService.queryById(id)); } @@ -179,7 +179,7 @@ public class RsStaffInfoController extends BaseController { // @SaCheckPermission("rs:staffInfo:remove") @Log(title = "人员信息", businessType = BusinessType.DELETE) @DeleteMapping("/{ids}") - public R remove(@NotEmpty(message = "主键不能为空") @PathVariable Long[] ids) { + public R remove(@NotEmpty(message = "主键不能为空") @PathVariable("ids") Long[] ids) { return toAjax(staffInfoService.deleteWithRelatedData(java.util.Arrays.asList(ids))); } diff --git a/backend/ruoyi-modules/ruoyi-rs/src/main/java/org/dromara/rs/controller/RsTrainingApplicationController.java b/backend/ruoyi-modules/ruoyi-rs/src/main/java/org/dromara/rs/controller/RsTrainingApplicationController.java index a2b02e7c..4c61655c 100644 --- a/backend/ruoyi-modules/ruoyi-rs/src/main/java/org/dromara/rs/controller/RsTrainingApplicationController.java +++ b/backend/ruoyi-modules/ruoyi-rs/src/main/java/org/dromara/rs/controller/RsTrainingApplicationController.java @@ -243,7 +243,7 @@ public class RsTrainingApplicationController extends BaseController { // @SaCheckPermission("rs:trainingapplication:remove") @Log(title = "培训申请", businessType = BusinessType.DELETE) @DeleteMapping("/{applicationIds}") - public R remove(@PathVariable Long[] applicationIds) { + public R remove(@PathVariable("applicationIds") Long[] applicationIds) { return toAjax(trainingApplicationService.deleteRsTrainingApplicationByIds(applicationIds)); } @@ -459,7 +459,7 @@ public class RsTrainingApplicationController extends BaseController { */ // @SaCheckPermission("rs:trainingapplication:query") @GetMapping("/companions/batch") - public R> batchQueryCompanions(@RequestParam String userIds) { + public R> batchQueryCompanions(@RequestParam("userIds") String userIds) { log.info("批量查询同行人信息,用户ID列表: {}", userIds); // 参数验证 diff --git a/backend/ruoyi-modules/ruoyi-rs/src/main/java/org/dromara/rs/controller/RsTrainingApprovalController.java b/backend/ruoyi-modules/ruoyi-rs/src/main/java/org/dromara/rs/controller/RsTrainingApprovalController.java index 759ae74a..48cadd58 100644 --- a/backend/ruoyi-modules/ruoyi-rs/src/main/java/org/dromara/rs/controller/RsTrainingApprovalController.java +++ b/backend/ruoyi-modules/ruoyi-rs/src/main/java/org/dromara/rs/controller/RsTrainingApprovalController.java @@ -94,7 +94,7 @@ public class RsTrainingApprovalController extends BaseController { // @SaCheckPermission("rs:trainingapproval:remove") @Log(title = "培训审批", businessType = BusinessType.DELETE) @DeleteMapping("/{approvalIds}") - public R remove(@PathVariable Long[] approvalIds) { + public R remove(@PathVariable("approvalIds") Long[] approvalIds) { return toAjax(trainingApprovalService.deleteRsTrainingApprovalByIds(approvalIds)); } diff --git a/backend/ruoyi-modules/ruoyi-rs/src/main/java/org/dromara/rs/controller/RsTrainingRecordController.java b/backend/ruoyi-modules/ruoyi-rs/src/main/java/org/dromara/rs/controller/RsTrainingRecordController.java index 5c2562c4..9e34f3ab 100644 --- a/backend/ruoyi-modules/ruoyi-rs/src/main/java/org/dromara/rs/controller/RsTrainingRecordController.java +++ b/backend/ruoyi-modules/ruoyi-rs/src/main/java/org/dromara/rs/controller/RsTrainingRecordController.java @@ -57,7 +57,7 @@ public class RsTrainingRecordController extends BaseController { */ // @SaCheckPermission("rs:trainingrecord:list") @GetMapping("/test-location") - public R> testLocationSearch(@RequestParam String location) { + public R> testLocationSearch(@RequestParam("location") String location) { log.info("测试培训地点搜索 - location参数: {}", location); // 创建查询对象 @@ -127,7 +127,7 @@ public class RsTrainingRecordController extends BaseController { // @SaCheckPermission("rs:trainingrecord:remove") @Log(title = "培训记录", businessType = BusinessType.DELETE) @DeleteMapping("/{recordIds}") - public R remove(@PathVariable Long[] recordIds) { + public R remove(@PathVariable("recordIds") Long[] recordIds) { return toAjax(trainingRecordService.deleteRsTrainingRecordByIds(recordIds)); } @@ -212,7 +212,7 @@ public class RsTrainingRecordController extends BaseController { // @SaCheckPermission("rs:trainingrecord:edit") @Log(title = "上传培训证书文件", businessType = BusinessType.UPDATE) @PostMapping("/certificate/upload/{recordId}") - public R> uploadCertificateFile(@PathVariable Long recordId, + public R> uploadCertificateFile(@PathVariable("recordId") Long recordId, @RequestParam("file") MultipartFile file) throws IOException { if (file.isEmpty()) { return R.fail("上传失败,请选择文件"); @@ -273,7 +273,7 @@ public class RsTrainingRecordController extends BaseController { // @SaCheckPermission("rs:trainingrecord:edit") @Log(title = "更新培训记录证书附件", businessType = BusinessType.UPDATE) @PutMapping("/attachments/{recordId}") - public R updateAttachments(@PathVariable Long recordId, @RequestBody Map params) { + public R updateAttachments(@PathVariable("recordId") Long recordId, @RequestBody Map params) { String attachmentIds = params.get("attachmentIds"); return toAjax(trainingRecordService.updateAttachments(recordId, attachmentIds)); } diff --git a/backend/ruoyi-modules/ruoyi-stgl/src/main/java/org/dromara/stgl/controller/StglActivityAttendanceController.java b/backend/ruoyi-modules/ruoyi-stgl/src/main/java/org/dromara/stgl/controller/StglActivityAttendanceController.java index ff5968a0..dd9d8579 100644 --- a/backend/ruoyi-modules/ruoyi-stgl/src/main/java/org/dromara/stgl/controller/StglActivityAttendanceController.java +++ b/backend/ruoyi-modules/ruoyi-stgl/src/main/java/org/dromara/stgl/controller/StglActivityAttendanceController.java @@ -64,7 +64,7 @@ public class StglActivityAttendanceController extends BaseController { //@SaCheckPermission("stgl:activityAttendance:query") @GetMapping("/{id}") public R getInfo(@NotNull(message = "主键不能为空") - @PathVariable Long id) { + @PathVariable("id") Long id) { return R.ok(stglActivityAttendanceService.queryById(id)); } @@ -97,7 +97,7 @@ public class StglActivityAttendanceController extends BaseController { @Log(title = "活动考勤签到", businessType = BusinessType.DELETE) @DeleteMapping("/{ids}") public R remove(@NotEmpty(message = "主键不能为空") - @PathVariable Long[] ids) { + @PathVariable("ids") Long[] ids) { return toAjax(stglActivityAttendanceService.deleteWithValidByIds(List.of(ids), true)); } @@ -116,7 +116,7 @@ public class StglActivityAttendanceController extends BaseController { */ //@SaCheckPermission("stgl:activityAttendance:query") @GetMapping("/getByActivityAndUser") - public R getByActivityAndUser(@RequestParam Long activityId) { + public R getByActivityAndUser(@RequestParam("activityId") Long activityId) { Long userId = LoginHelper.getUserId(); return R.ok(stglActivityAttendanceService.queryByActivityAndUser(activityId, userId)); } diff --git a/backend/ruoyi-modules/ruoyi-stgl/src/main/java/org/dromara/stgl/controller/StglActivityAuditController.java b/backend/ruoyi-modules/ruoyi-stgl/src/main/java/org/dromara/stgl/controller/StglActivityAuditController.java index 04c868ad..ebbb1fec 100644 --- a/backend/ruoyi-modules/ruoyi-stgl/src/main/java/org/dromara/stgl/controller/StglActivityAuditController.java +++ b/backend/ruoyi-modules/ruoyi-stgl/src/main/java/org/dromara/stgl/controller/StglActivityAuditController.java @@ -40,7 +40,7 @@ public class StglActivityAuditController extends BaseController { //@SaCheckPermission("stgl:activity:query") @GetMapping("/{id}") public R getInfo(@NotNull(message = "主键不能为空") - @PathVariable Long id) { + @PathVariable("id") Long id) { return R.ok(stglActivityAuditService.queryById(id)); } @@ -50,7 +50,7 @@ public class StglActivityAuditController extends BaseController { //@SaCheckPermission("stgl:activity:query") @GetMapping("/byActivity/{activityId}") public R> getByActivityId(@NotNull(message = "活动ID不能为空") - @PathVariable Long activityId) { + @PathVariable("activityId") Long activityId) { return R.ok(stglActivityAuditService.queryByActivityId(activityId)); } @@ -60,7 +60,7 @@ public class StglActivityAuditController extends BaseController { //@SaCheckPermission("stgl:activity:query") @GetMapping("/pending/{approverId}") public R> getPendingByApproverId(@NotNull(message = "审批人ID不能为空") - @PathVariable Long approverId) { + @PathVariable("approverId") Long approverId) { return R.ok(stglActivityAuditService.queryPendingByApproverId(approverId)); } @@ -93,7 +93,7 @@ public class StglActivityAuditController extends BaseController { @Log(title = "活动审批记录", businessType = BusinessType.DELETE) @DeleteMapping("/{ids}") public R remove(@NotEmpty(message = "主键不能为空") - @PathVariable Long[] ids) { + @PathVariable("ids") Long[] ids) { return toAjax(stglActivityAuditService.deleteWithValidByIds(List.of(ids), true)); } diff --git a/backend/ruoyi-modules/ruoyi-stgl/src/main/java/org/dromara/stgl/controller/StglActivityController.java b/backend/ruoyi-modules/ruoyi-stgl/src/main/java/org/dromara/stgl/controller/StglActivityController.java index df139572..d64e5ea0 100644 --- a/backend/ruoyi-modules/ruoyi-stgl/src/main/java/org/dromara/stgl/controller/StglActivityController.java +++ b/backend/ruoyi-modules/ruoyi-stgl/src/main/java/org/dromara/stgl/controller/StglActivityController.java @@ -64,7 +64,7 @@ public class StglActivityController extends BaseController { */ //@SaCheckPermission("stgl:activity:query") @GetMapping("/{id}") - public R getInfo(@NotNull(message = "主键不能为空") @PathVariable Long id) { + public R getInfo(@NotNull(message = "主键不能为空") @PathVariable("id") Long id) { return R.ok(stglActivityService.queryById(id)); } @@ -96,7 +96,7 @@ public class StglActivityController extends BaseController { //@SaCheckPermission("stgl:activity:remove") @Log(title = "活动信息", businessType = BusinessType.DELETE) @DeleteMapping("/{ids}") - public R remove(@NotEmpty(message = "主键不能为空") @PathVariable Long[] ids) { + public R remove(@NotEmpty(message = "主键不能为空") @PathVariable("ids") Long[] ids) { return toAjax(stglActivityService.deleteWithValidByIds(List.of(ids), true)); } @@ -152,7 +152,7 @@ public class StglActivityController extends BaseController { */ //@SaCheckPermission("stgl:activity:query") @GetMapping("/{id}/ratings") - public R> getActivityRatings(@NotNull(message = "活动ID不能为空") @PathVariable Long id) { + public R> getActivityRatings(@NotNull(message = "活动ID不能为空") @PathVariable("id") Long id) { return R.ok(stglActivityService.getActivityRatings(id)); } diff --git a/backend/ruoyi-modules/ruoyi-stgl/src/main/java/org/dromara/stgl/controller/StglActivityRegisterController.java b/backend/ruoyi-modules/ruoyi-stgl/src/main/java/org/dromara/stgl/controller/StglActivityRegisterController.java index 0a547cdd..4e8cf21d 100644 --- a/backend/ruoyi-modules/ruoyi-stgl/src/main/java/org/dromara/stgl/controller/StglActivityRegisterController.java +++ b/backend/ruoyi-modules/ruoyi-stgl/src/main/java/org/dromara/stgl/controller/StglActivityRegisterController.java @@ -63,7 +63,7 @@ public class StglActivityRegisterController extends BaseController { */ //@SaCheckPermission("stgl:activityRegister:query") @GetMapping("/{id}") - public R getInfo(@NotNull(message = "主键不能为空") @PathVariable Long id) { + public R getInfo(@NotNull(message = "主键不能为空") @PathVariable("id") Long id) { return R.ok(stglActivityRegistrationService.queryById(id)); } @@ -93,7 +93,7 @@ public class StglActivityRegisterController extends BaseController { //@SaCheckPermission("stgl:activityRegister:remove") @Log(title = "活动报名管理", businessType = BusinessType.DELETE) @DeleteMapping("/{ids}") - public R remove(@NotEmpty(message = "主键不能为空") @PathVariable Long[] ids) { + public R remove(@NotEmpty(message = "主键不能为空") @PathVariable("ids") Long[] ids) { return toAjax(stglActivityRegistrationService.deleteWithValidByIds(List.of(ids), true)); } @@ -103,9 +103,9 @@ public class StglActivityRegisterController extends BaseController { //@SaCheckPermission("stgl:activityRegister:approve") @Log(title = "活动报名审核", businessType = BusinessType.UPDATE) @PostMapping("/approve/{id}") - public R approve(@NotNull(message = "主键不能为空") @PathVariable Long id, - @RequestParam Integer approvalStatus, - @RequestParam(required = false) String approvalRemark) { + public R approve(@NotNull(message = "主键不能为空") @PathVariable("id") Long id, + @RequestParam("approvalStatus") Integer approvalStatus, + @RequestParam(value = "approvalRemark", required = false) String approvalRemark) { StglActivityRegistrationBo bo = new StglActivityRegistrationBo(); bo.setId(id); bo.setApprovalStatus(approvalStatus.toString()); @@ -130,8 +130,8 @@ public class StglActivityRegisterController extends BaseController { //@SaCheckPermission("stgl:activityRegister:recordScore") @Log(title = "录入成绩", businessType = BusinessType.UPDATE) @PostMapping("/score/{id}") - public R recordScore(@NotNull(message = "主键不能为空") @PathVariable Long id, - @RequestParam String score) { + public R recordScore(@NotNull(message = "主键不能为空") @PathVariable("id") Long id, + @RequestParam("score") String score) { return toAjax(stglActivityRegistrationService.inputScore(id, score)); } } \ No newline at end of file diff --git a/backend/ruoyi-modules/ruoyi-stgl/src/main/java/org/dromara/stgl/controller/StglActivityRegisterHallController.java b/backend/ruoyi-modules/ruoyi-stgl/src/main/java/org/dromara/stgl/controller/StglActivityRegisterHallController.java index 4684121f..636f4bca 100644 --- a/backend/ruoyi-modules/ruoyi-stgl/src/main/java/org/dromara/stgl/controller/StglActivityRegisterHallController.java +++ b/backend/ruoyi-modules/ruoyi-stgl/src/main/java/org/dromara/stgl/controller/StglActivityRegisterHallController.java @@ -47,7 +47,7 @@ public class StglActivityRegisterHallController extends BaseController { * 获取活动详细信息 */ @GetMapping("/{id}") - public R getInfo(@PathVariable Long id) { + public R getInfo(@PathVariable("id") Long id) { return R.ok(stglActivityService.queryById(id)); } @@ -66,7 +66,7 @@ public class StglActivityRegisterHallController extends BaseController { * 检查用户是否已报名某活动 */ @GetMapping("/checkRegistration/{activityId}") - public R checkRegistration(@PathVariable Long activityId) { + public R checkRegistration(@PathVariable("activityId") Long activityId) { Long userId = LoginHelper.getUserId(); boolean isRegistered = stglActivityRegistrationService.checkUserRegistration(activityId, userId); return R.ok(isRegistered); diff --git a/backend/ruoyi-modules/ruoyi-stgl/src/main/java/org/dromara/stgl/controller/StglActivityRegistrationController.java b/backend/ruoyi-modules/ruoyi-stgl/src/main/java/org/dromara/stgl/controller/StglActivityRegistrationController.java index edba92c2..48409731 100644 --- a/backend/ruoyi-modules/ruoyi-stgl/src/main/java/org/dromara/stgl/controller/StglActivityRegistrationController.java +++ b/backend/ruoyi-modules/ruoyi-stgl/src/main/java/org/dromara/stgl/controller/StglActivityRegistrationController.java @@ -62,7 +62,7 @@ public class StglActivityRegistrationController extends BaseController { */ //@SaCheckPermission("stgl:activityregistration:query") @GetMapping("/{id}") - public R getInfo(@NotNull(message = "主键不能为空") @PathVariable Long id) { + public R getInfo(@NotNull(message = "主键不能为空") @PathVariable("id") Long id) { return R.ok(stglActivityRegistrationService.queryById(id)); } @@ -92,7 +92,7 @@ public class StglActivityRegistrationController extends BaseController { //@SaCheckPermission("stgl:activityregistration:remove") @Log(title = "活动报名", businessType = BusinessType.DELETE) @DeleteMapping("/{ids}") - public R remove(@NotEmpty(message = "主键不能为空") @PathVariable Long[] ids) { + public R remove(@NotEmpty(message = "主键不能为空") @PathVariable("ids") Long[] ids) { return toAjax(stglActivityRegistrationService.deleteWithValidByIds(List.of(ids), true)); } @@ -102,9 +102,9 @@ public class StglActivityRegistrationController extends BaseController { //@SaCheckPermission("stgl:activityregistration:approval") @Log(title = "活动报名审核", businessType = BusinessType.UPDATE) @PostMapping("/approval") - public R approval(@RequestParam Long id, - @RequestParam String approvalStatus, - @RequestParam(required = false) String approvalRemark) { + public R approval(@RequestParam("id") Long id, + @RequestParam("approvalStatus") String approvalStatus, + @RequestParam(value = "approvalRemark", required = false) String approvalRemark) { return toAjax(stglActivityRegistrationService.approvalRegistration(id, approvalStatus, approvalRemark)); } @@ -114,7 +114,7 @@ public class StglActivityRegistrationController extends BaseController { //@SaCheckPermission("stgl:activityregistration:score") @Log(title = "录入成绩", businessType = BusinessType.UPDATE) @PostMapping("/inputScore") - public R inputScore(@RequestParam Long id, @RequestParam String score) { + public R inputScore(@RequestParam("id") Long id, @RequestParam("score") String score) { return toAjax(stglActivityRegistrationService.inputScore(id, score)); } @@ -122,7 +122,7 @@ public class StglActivityRegistrationController extends BaseController { * 检查用户是否已报名该活动 */ @GetMapping("/checkRegistered") - public R checkRegistered(@RequestParam Long activityId, @RequestParam(required = false) Long userId) { + public R checkRegistered(@RequestParam("activityId") Long activityId, @RequestParam(value = "userId", required = false) Long userId) { Long currentUserId = userId != null ? userId : LoginHelper.getUserId(); return R.ok(stglActivityRegistrationService.checkUserRegistered(activityId, currentUserId)); } @@ -131,7 +131,7 @@ public class StglActivityRegistrationController extends BaseController { * 获取用户在指定活动的报名信息 */ @GetMapping("/getUserRegistration") - public R getUserRegistration(@RequestParam Long activityId, @RequestParam(required = false) Long userId) { + public R getUserRegistration(@RequestParam("activityId") Long activityId, @RequestParam(value = "userId", required = false) Long userId) { Long currentUserId = userId != null ? userId : LoginHelper.getUserId(); return R.ok(stglActivityRegistrationService.getUserRegistration(activityId, currentUserId)); } diff --git a/backend/ruoyi-modules/ruoyi-stgl/src/main/java/org/dromara/stgl/controller/StglActivityTeamInfoController.java b/backend/ruoyi-modules/ruoyi-stgl/src/main/java/org/dromara/stgl/controller/StglActivityTeamInfoController.java index 66dddf87..c5fcd013 100644 --- a/backend/ruoyi-modules/ruoyi-stgl/src/main/java/org/dromara/stgl/controller/StglActivityTeamInfoController.java +++ b/backend/ruoyi-modules/ruoyi-stgl/src/main/java/org/dromara/stgl/controller/StglActivityTeamInfoController.java @@ -61,7 +61,7 @@ public class StglActivityTeamInfoController extends BaseController { */ //@SaCheckPermission("stgl:activityteaminfo:query") @GetMapping("/{id}") - public R getInfo(@NotNull(message = "主键不能为空") @PathVariable Long id) { + public R getInfo(@NotNull(message = "主键不能为空") @PathVariable("id") Long id) { return R.ok(stglActivityTeamInfoService.queryById(id)); } @@ -91,7 +91,7 @@ public class StglActivityTeamInfoController extends BaseController { //@SaCheckPermission("stgl:activityteaminfo:remove") @Log(title = "活动团队信息", businessType = BusinessType.DELETE) @DeleteMapping("/{ids}") - public R remove(@NotEmpty(message = "主键不能为空") @PathVariable Long[] ids) { + public R remove(@NotEmpty(message = "主键不能为空") @PathVariable("ids") Long[] ids) { return toAjax(stglActivityTeamInfoService.deleteWithValidByIds(List.of(ids), true)); } @@ -99,7 +99,7 @@ public class StglActivityTeamInfoController extends BaseController { * 根据活动ID查询团队列表 */ @GetMapping("/activity/{activityId}") - public R> getTeamsByActivityId(@PathVariable Long activityId) { + public R> getTeamsByActivityId(@PathVariable("activityId") Long activityId) { return R.ok(stglActivityTeamInfoService.queryByActivityId(activityId)); } } \ No newline at end of file diff --git a/backend/ruoyi-modules/ruoyi-stgl/src/main/java/org/dromara/stgl/controller/StglAnnualReviewAuditController.java b/backend/ruoyi-modules/ruoyi-stgl/src/main/java/org/dromara/stgl/controller/StglAnnualReviewAuditController.java index 9fe17697..7a9918c1 100644 --- a/backend/ruoyi-modules/ruoyi-stgl/src/main/java/org/dromara/stgl/controller/StglAnnualReviewAuditController.java +++ b/backend/ruoyi-modules/ruoyi-stgl/src/main/java/org/dromara/stgl/controller/StglAnnualReviewAuditController.java @@ -43,7 +43,7 @@ public class StglAnnualReviewAuditController extends BaseController { //@SaCheckPermission("stgl:annualReviewAudit:query") @GetMapping("/{id}") public R getInfo(@NotNull(message = "主键不能为空") - @PathVariable Long id) { + @PathVariable("id") Long id) { return R.ok(stglAnnualReviewAuditService.queryById(id)); } @@ -53,7 +53,7 @@ public class StglAnnualReviewAuditController extends BaseController { //@SaCheckPermission("stgl:annualReviewAudit:query") @GetMapping("/byAnnualReview/{annualReviewId}") public R> getByAnnualReviewId(@NotNull(message = "年审记录ID不能为空") - @PathVariable Long annualReviewId) { + @PathVariable("annualReviewId") Long annualReviewId) { return R.ok(stglAnnualReviewAuditService.queryByAnnualReviewId(annualReviewId)); } @@ -63,7 +63,7 @@ public class StglAnnualReviewAuditController extends BaseController { //@SaCheckPermission("stgl:annualReviewAudit:query") @GetMapping("/pending/{approverId}") public R> getPendingByApproverId(@NotNull(message = "审批人ID不能为空") - @PathVariable Long approverId) { + @PathVariable("approverId") Long approverId) { return R.ok(stglAnnualReviewAuditService.queryPendingByApproverId(approverId)); } @@ -96,7 +96,7 @@ public class StglAnnualReviewAuditController extends BaseController { @Log(title = "社团年审审批", businessType = BusinessType.DELETE) @DeleteMapping("/{ids}") public R remove(@NotEmpty(message = "主键不能为空") - @PathVariable Long[] ids) { + @PathVariable("ids") Long[] ids) { return toAjax(stglAnnualReviewAuditService.deleteWithValidByIds(List.of(ids), true)); } diff --git a/backend/ruoyi-modules/ruoyi-stgl/src/main/java/org/dromara/stgl/controller/StglAuditorController.java b/backend/ruoyi-modules/ruoyi-stgl/src/main/java/org/dromara/stgl/controller/StglAuditorController.java index e448864b..8112b31d 100644 --- a/backend/ruoyi-modules/ruoyi-stgl/src/main/java/org/dromara/stgl/controller/StglAuditorController.java +++ b/backend/ruoyi-modules/ruoyi-stgl/src/main/java/org/dromara/stgl/controller/StglAuditorController.java @@ -65,7 +65,7 @@ public class StglAuditorController extends BaseController { //@SaCheckPermission("stgl:auditor:query") @GetMapping("/{id}") public R getInfo(@NotNull(message = "主键不能为空") - @PathVariable Long id) { + @PathVariable("id") Long id) { return R.ok(stglAuditorService.queryById(id)); } @@ -98,7 +98,7 @@ public class StglAuditorController extends BaseController { @Log(title = "社团管理审核人配置", businessType = BusinessType.DELETE) @DeleteMapping("/{ids}") public R remove(@NotEmpty(message = "主键不能为空") - @PathVariable Long[] ids) { + @PathVariable("ids") Long[] ids) { return toAjax(stglAuditorService.deleteWithValidByIds(List.of(ids))); } @@ -147,7 +147,7 @@ public class StglAuditorController extends BaseController { */ //@SaCheckPermission("stgl:auditor:list") @GetMapping("/users/{deptId}") - public R> listUserByDeptId(@PathVariable String deptId) { + public R> listUserByDeptId(@PathVariable("deptId") String deptId) { List users = sysUserService.selectUserListByDept(Long.valueOf(deptId)); return R.ok(users); } diff --git a/backend/ruoyi-modules/ruoyi-stgl/src/main/java/org/dromara/stgl/controller/StglClassController.java b/backend/ruoyi-modules/ruoyi-stgl/src/main/java/org/dromara/stgl/controller/StglClassController.java index a486ec55..da1ef74e 100644 --- a/backend/ruoyi-modules/ruoyi-stgl/src/main/java/org/dromara/stgl/controller/StglClassController.java +++ b/backend/ruoyi-modules/ruoyi-stgl/src/main/java/org/dromara/stgl/controller/StglClassController.java @@ -63,7 +63,7 @@ public class StglClassController extends BaseController { */ //@SaCheckPermission("stgl:stclass:query") @GetMapping("/student/clubs/{studentId}") - public R>> getStudentClubs(@NotNull(message = "学生ID不能为空") @PathVariable Long studentId) { + public R>> getStudentClubs(@NotNull(message = "学生ID不能为空") @PathVariable("studentId") Long studentId) { List> list = stglClassService.getStudentClubs(studentId); return R.ok(list); } @@ -73,7 +73,7 @@ public class StglClassController extends BaseController { */ //@SaCheckPermission("stgl:stclass:query") @GetMapping("/student/volunteer-teams/{studentId}") - public R>> getStudentVolunteerTeams(@NotNull(message = "学生ID不能为空") @PathVariable Long studentId) { + public R>> getStudentVolunteerTeams(@NotNull(message = "学生ID不能为空") @PathVariable("studentId") Long studentId) { List> list = stglClassService.getStudentVolunteerTeams(studentId); return R.ok(list); } @@ -83,7 +83,7 @@ public class StglClassController extends BaseController { */ //@SaCheckPermission("stgl:stclass:query") @GetMapping("/student/activities/{studentId}") - public R>> getStudentActivities(@NotNull(message = "学生ID不能为空") @PathVariable Long studentId) { + public R>> getStudentActivities(@NotNull(message = "学生ID不能为空") @PathVariable("studentId") Long studentId) { List> list = stglClassService.getStudentActivities(studentId); return R.ok(list); } diff --git a/backend/ruoyi-modules/ruoyi-stgl/src/main/java/org/dromara/stgl/controller/StglClubAdvisorHistoryController.java b/backend/ruoyi-modules/ruoyi-stgl/src/main/java/org/dromara/stgl/controller/StglClubAdvisorHistoryController.java index d2e0e181..60677c23 100644 --- a/backend/ruoyi-modules/ruoyi-stgl/src/main/java/org/dromara/stgl/controller/StglClubAdvisorHistoryController.java +++ b/backend/ruoyi-modules/ruoyi-stgl/src/main/java/org/dromara/stgl/controller/StglClubAdvisorHistoryController.java @@ -69,7 +69,7 @@ public class StglClubAdvisorHistoryController extends BaseController { @Operation(summary = "获取社团指导老师任职历史详细信息") //@SaCheckPermission("stgl:club:query") @GetMapping("/{id}") - public R getInfo(@NotNull(message = "主键不能为空") @PathVariable Long id) { + public R getInfo(@NotNull(message = "主键不能为空") @PathVariable("id") Long id) { return R.ok(stglClubAdvisorHistoryService.queryById(id)); } @@ -80,7 +80,7 @@ public class StglClubAdvisorHistoryController extends BaseController { //@SaCheckPermission("stgl:club:query") @GetMapping("/current/{clubId}") @Parameter(name = "clubId", description = "社团ID", required = true) - public R> getCurrentAdvisors(@PathVariable Long clubId) { + public R> getCurrentAdvisors(@PathVariable("clubId") Long clubId) { List list = stglClubAdvisorHistoryService.getCurrentAdvisorsByClubId(clubId); return R.ok(list); } @@ -92,7 +92,7 @@ public class StglClubAdvisorHistoryController extends BaseController { //@SaCheckPermission("stgl:club:query") @GetMapping("/history/{clubId}") @Parameter(name = "clubId", description = "社团ID", required = true) - public R> getHistoryAdvisors(@PathVariable Long clubId) { + public R> getHistoryAdvisors(@PathVariable("clubId") Long clubId) { List list = stglClubAdvisorHistoryService.getHistoryAdvisorsByClubId(clubId); return R.ok(list); } @@ -104,7 +104,7 @@ public class StglClubAdvisorHistoryController extends BaseController { //@SaCheckPermission("stgl:club:query") @GetMapping("/all/{clubId}") @Parameter(name = "clubId", description = "社团ID", required = true) - public R> getAllAdvisors(@PathVariable Long clubId) { + public R> getAllAdvisors(@PathVariable("clubId") Long clubId) { List list = stglClubAdvisorHistoryService.getAllAdvisorsByClubId(clubId); return R.ok(list); } @@ -140,7 +140,7 @@ public class StglClubAdvisorHistoryController extends BaseController { //@SaCheckPermission("stgl:club:remove") @Log(title = "社团指导老师任职历史", businessType = BusinessType.DELETE) @DeleteMapping("/{ids}") - public R remove(@NotEmpty(message = "主键不能为空") @PathVariable Long[] ids) { + public R remove(@NotEmpty(message = "主键不能为空") @PathVariable("ids") Long[] ids) { return toAjax(stglClubAdvisorHistoryService.deleteWithValidByIds(List.of(ids), true)); } diff --git a/backend/ruoyi-modules/ruoyi-stgl/src/main/java/org/dromara/stgl/controller/StglClubAnnualReviewController.java b/backend/ruoyi-modules/ruoyi-stgl/src/main/java/org/dromara/stgl/controller/StglClubAnnualReviewController.java index 7516329b..af499bb4 100644 --- a/backend/ruoyi-modules/ruoyi-stgl/src/main/java/org/dromara/stgl/controller/StglClubAnnualReviewController.java +++ b/backend/ruoyi-modules/ruoyi-stgl/src/main/java/org/dromara/stgl/controller/StglClubAnnualReviewController.java @@ -80,7 +80,7 @@ public class StglClubAnnualReviewController extends BaseController { //@SaCheckPermission("stgl:clubAnnualReview:query") @GetMapping("/{id}") public R getInfo(@NotNull(message = "主键不能为空") - @PathVariable Long id) { + @PathVariable("id") Long id) { return R.ok(stglClubAnnualReviewService.queryById(id)); } @@ -116,7 +116,7 @@ public class StglClubAnnualReviewController extends BaseController { @Log(title = "社团年审记录", businessType = BusinessType.DELETE) @DeleteMapping("/{ids}") public R remove(@NotEmpty(message = "主键不能为空") - @PathVariable Long[] ids) { + @PathVariable("ids") Long[] ids) { return toAjax(stglClubAnnualReviewService.deleteWithValidByIds(List.of(ids), true)); } @@ -129,7 +129,7 @@ public class StglClubAnnualReviewController extends BaseController { @RepeatSubmit() @PostMapping("/submit/{id}") public R submit(@NotNull(message = "主键不能为空") - @PathVariable Long id) { + @PathVariable("id") Long id) { return toAjax(stglClubAnnualReviewService.submitReview(id)); } @@ -142,7 +142,7 @@ public class StglClubAnnualReviewController extends BaseController { @RepeatSubmit() @PostMapping("/withdraw/{id}") public R withdraw(@NotNull(message = "主键不能为空") - @PathVariable Long id) { + @PathVariable("id") Long id) { return toAjax(stglClubAnnualReviewService.withdrawReview(id)); } @@ -156,7 +156,7 @@ public class StglClubAnnualReviewController extends BaseController { @PostMapping("/audit") public R audit(@RequestParam @NotNull(message = "年审记录ID不能为空") Long id, @RequestParam @NotBlank(message = "审核结果不能为空") String auditResult, - @RequestParam String auditOpinion, + @RequestParam("auditOpinion") String auditOpinion, @RequestParam @NotBlank(message = "审核类型不能为空") String auditType) { return toAjax(stglClubAnnualReviewService.auditReview(id, auditResult, auditOpinion, auditType)); } @@ -206,7 +206,7 @@ public class StglClubAnnualReviewController extends BaseController { //@SaCheckPermission("stgl:clubAnnualReview:query") @GetMapping("/{id}/activities") public R> getAnnualReviewActivities( - @NotNull(message = "年审记录ID不能为空") @PathVariable Long id) { + @NotNull(message = "年审记录ID不能为空") @PathVariable("id") Long id) { return R.ok(stglClubAnnualReviewService.getAnnualReviewActivities(id)); } diff --git a/backend/ruoyi-modules/ruoyi-stgl/src/main/java/org/dromara/stgl/controller/StglClubController.java b/backend/ruoyi-modules/ruoyi-stgl/src/main/java/org/dromara/stgl/controller/StglClubController.java index 927bdd2e..9401e715 100644 --- a/backend/ruoyi-modules/ruoyi-stgl/src/main/java/org/dromara/stgl/controller/StglClubController.java +++ b/backend/ruoyi-modules/ruoyi-stgl/src/main/java/org/dromara/stgl/controller/StglClubController.java @@ -71,7 +71,7 @@ public class StglClubController extends BaseController { //@SaCheckPermission("stgl:club:query") @GetMapping("/{id}") public R getInfo(@NotNull(message = "主键不能为空") - @PathVariable Long id) { + @PathVariable("id") Long id) { return R.ok(stglClubService.queryById(id)); } @@ -107,7 +107,7 @@ public class StglClubController extends BaseController { @Log(title = "社团信息", businessType = BusinessType.DELETE) @DeleteMapping("/{ids}") public R remove(@NotEmpty(message = "主键不能为空") - @PathVariable Long[] ids) { + @PathVariable("ids") Long[] ids) { return toAjax(stglClubService.deleteWithValidByIds(List.of(ids), true)); } @@ -130,7 +130,7 @@ public class StglClubController extends BaseController { @Parameters({ @Parameter(name = "clubType", description = "社团类型", required = true) }) - public R> listByType(@PathVariable String clubType) { + public R> listByType(@PathVariable("clubType") String clubType) { return R.ok(stglClubService.queryByClubType(clubType)); } @@ -154,7 +154,7 @@ public class StglClubController extends BaseController { @Parameter(name = "clubName", description = "社团名称", required = true), @Parameter(name = "id", description = "社团ID,编辑时排除自己", required = false) }) - public R checkClubName(@RequestParam String clubName, @RequestParam(required = false) Long id) { + public R checkClubName(@RequestParam("clubName") String clubName, @RequestParam(value = "id", required = false) Long id) { return R.ok(stglClubService.checkClubNameExists(clubName, id)); } @@ -167,7 +167,7 @@ public class StglClubController extends BaseController { @Parameters({ @Parameter(name = "id", description = "社团ID", required = true) }) - public R checkPresidentRole(@PathVariable Long id) { + public R checkPresidentRole(@PathVariable("id") Long id) { Long currentUserId = LoginHelper.getUserId(); if (currentUserId == null) { return R.ok(false); @@ -188,7 +188,7 @@ public class StglClubController extends BaseController { @Parameter(name = "id", description = "社团ID", required = true), @Parameter(name = "newPresidentUserId", description = "新社长用户ID", required = true) }) - public R transferClub(@PathVariable Long id, @RequestParam Long newPresidentUserId) { + public R transferClub(@PathVariable("id") Long id, @RequestParam("newPresidentUserId") Long newPresidentUserId) { return toAjax(stglClubService.transferClub(id, newPresidentUserId)); } @@ -198,7 +198,7 @@ public class StglClubController extends BaseController { @Operation(summary = "测试副社长数据映射") //@SaCheckPermission("stgl:club:query") @GetMapping("/testVicePresidentData/{id}") - public R testVicePresidentData(@PathVariable Long id) { + public R testVicePresidentData(@PathVariable("id") Long id) { StglClubVo club = stglClubService.queryById(id); if (club != null) { // 输出调试信息到日志 @@ -224,7 +224,7 @@ public class StglClubController extends BaseController { @Parameter(name = "id", description = "社团ID", required = true), @Parameter(name = "status", description = "状态", required = true) }) - public R changeStatus(@RequestParam Long id, @RequestParam Integer status) { + public R changeStatus(@RequestParam("id") Long id, @RequestParam("status") Integer status) { return toAjax(stglClubService.changeStatus(id, status)); } @@ -239,7 +239,7 @@ public class StglClubController extends BaseController { @Parameter(name = "id", description = "社团ID", required = true), @Parameter(name = "sighOpen", description = "报名开启状态(Y/N)", required = true) }) - public R changeSighOpenStatus(@RequestParam Long id, @RequestParam String sighOpen) { + public R changeSighOpenStatus(@RequestParam("id") Long id, @RequestParam("sighOpen") String sighOpen) { return toAjax(stglClubService.changeSighOpenStatus(id, sighOpen)); } diff --git a/backend/ruoyi-modules/ruoyi-stgl/src/main/java/org/dromara/stgl/controller/StglClubPermissionController.java b/backend/ruoyi-modules/ruoyi-stgl/src/main/java/org/dromara/stgl/controller/StglClubPermissionController.java index 497a709b..5f501d8e 100644 --- a/backend/ruoyi-modules/ruoyi-stgl/src/main/java/org/dromara/stgl/controller/StglClubPermissionController.java +++ b/backend/ruoyi-modules/ruoyi-stgl/src/main/java/org/dromara/stgl/controller/StglClubPermissionController.java @@ -40,7 +40,7 @@ public class StglClubPermissionController extends BaseController { //@SaCheckPermission("stgl:club:list") @GetMapping("/checkActivityPermission/{clubId}") @Log(title = "检查社团活动权限", businessType = BusinessType.OTHER) - public R checkActivityPermission(@PathVariable Long clubId) { + public R checkActivityPermission(@PathVariable("clubId") Long clubId) { log.info("检查社团活动权限请求,clubId: {}", clubId); if (clubId == null || clubId <= 0) { @@ -97,7 +97,7 @@ public class StglClubPermissionController extends BaseController { */ //@SaCheckPermission("stgl:club:list") @GetMapping("/isInAnnualReviewWindow/{clubId}") - public R isInAnnualReviewWindow(@PathVariable Long clubId) { + public R isInAnnualReviewWindow(@PathVariable("clubId") Long clubId) { log.debug("检查社团是否在年审窗口期,clubId: {}", clubId); if (clubId == null || clubId <= 0) { @@ -121,7 +121,7 @@ public class StglClubPermissionController extends BaseController { */ //@SaCheckPermission("stgl:club:list") @GetMapping("/getDaysUntilNextAnnualReview/{clubId}") - public R getDaysUntilNextAnnualReview(@PathVariable Long clubId) { + public R getDaysUntilNextAnnualReview(@PathVariable("clubId") Long clubId) { log.debug("获取社团距离年审天数,clubId: {}", clubId); if (clubId == null || clubId <= 0) { @@ -145,7 +145,7 @@ public class StglClubPermissionController extends BaseController { */ //@SaCheckPermission("stgl:club:list") @GetMapping("/hasSubmittedCurrentYearAnnualReview/{clubId}") - public R hasSubmittedCurrentYearAnnualReview(@PathVariable Long clubId) { + public R hasSubmittedCurrentYearAnnualReview(@PathVariable("clubId") Long clubId) { log.debug("检查社团是否已提交年审,clubId: {}", clubId); if (clubId == null || clubId <= 0) { @@ -170,7 +170,7 @@ public class StglClubPermissionController extends BaseController { //@SaCheckPermission("stgl:club:list") @GetMapping("/getPermissionDetails/{clubId}") @Log(title = "获取社团权限详情", businessType = BusinessType.OTHER) - public R> getPermissionDetails(@PathVariable Long clubId) { + public R> getPermissionDetails(@PathVariable("clubId") Long clubId) { log.info("获取社团权限详情,clubId: {}", clubId); if (clubId == null || clubId <= 0) { diff --git a/backend/ruoyi-modules/ruoyi-stgl/src/main/java/org/dromara/stgl/controller/StglClubRegisterController.java b/backend/ruoyi-modules/ruoyi-stgl/src/main/java/org/dromara/stgl/controller/StglClubRegisterController.java index 92af9851..46d9e4c4 100644 --- a/backend/ruoyi-modules/ruoyi-stgl/src/main/java/org/dromara/stgl/controller/StglClubRegisterController.java +++ b/backend/ruoyi-modules/ruoyi-stgl/src/main/java/org/dromara/stgl/controller/StglClubRegisterController.java @@ -43,8 +43,8 @@ public class StglClubRegisterController extends BaseController { @Operation(summary = "查询社团报名大厅列表") //@SaCheckPermission("stgl:club:list") @GetMapping("/list") - public TableDataInfo list(@RequestParam(required = false) String clubType, - @RequestParam(required = false) String clubName, + public TableDataInfo list(@RequestParam(value = "clubType", required = false) String clubType, + @RequestParam(value = "clubName", required = false) String clubName, PageQuery pageQuery) { return stglClubRegisterService.queryPageList(clubType, clubName, pageQuery); } @@ -54,8 +54,8 @@ public class StglClubRegisterController extends BaseController { */ @Operation(summary = "查询社团报名大厅列表(不分页)") @GetMapping("/listAll") - public R> listAll(@RequestParam(required = false) String clubType, - @RequestParam(required = false) String clubName) { + public R> listAll(@RequestParam(value = "clubType", required = false) String clubType, + @RequestParam(value = "clubName", required = false) String clubName) { return R.ok(stglClubRegisterService.queryList(clubType, clubName)); } @@ -67,7 +67,7 @@ public class StglClubRegisterController extends BaseController { @Parameters({ @Parameter(name = "clubId", description = "社团ID", required = true) }) - public R getClubDetail(@PathVariable Long clubId) { + public R getClubDetail(@PathVariable("clubId") Long clubId) { return R.ok(stglClubRegisterService.queryClubDetail(clubId)); } @@ -78,7 +78,7 @@ public class StglClubRegisterController extends BaseController { //@SaCheckPermission("stgl:register:apply") @Log(title = "社团申请", businessType = BusinessType.INSERT) @PostMapping("/apply") - public R applyClub(@RequestParam Long clubId, @RequestBody StglClubApplyBo applyBo) { + public R applyClub(@RequestParam("clubId") Long clubId, @RequestBody StglClubApplyBo applyBo) { Long userId = LoginHelper.getUserId(); String reason = applyBo != null ? applyBo.getReason() : null; return toAjax(stglClubRegisterService.registerClub(clubId, userId, reason)); @@ -94,7 +94,7 @@ public class StglClubRegisterController extends BaseController { @Parameters({ @Parameter(name = "clubId", description = "社团ID", required = true) }) - public R quitClub(@PathVariable Long clubId) { + public R quitClub(@PathVariable("clubId") Long clubId) { Long userId = LoginHelper.getUserId(); return toAjax(stglClubRegisterService.quitClub(clubId, userId)); } @@ -118,7 +118,7 @@ public class StglClubRegisterController extends BaseController { @Parameters({ @Parameter(name = "clubId", description = "社团ID", required = true) }) - public R checkRegistered(@PathVariable Long clubId) { + public R checkRegistered(@PathVariable("clubId") Long clubId) { try { Long userId = LoginHelper.getUserId(); return R.ok(stglClubRegisterService.checkRegistered(clubId, userId)); @@ -138,7 +138,7 @@ public class StglClubRegisterController extends BaseController { @Parameter(name = "clubType", description = "社团类型", required = false), @Parameter(name = "limit", description = "推荐数量", required = false) }) - public R> getRecommendClubs(@RequestParam(required = false) String clubType, + public R> getRecommendClubs(@RequestParam(value = "clubType", required = false) String clubType, @RequestParam(required = false, defaultValue = "6") Integer limit) { return R.ok(stglClubRegisterService.queryRecommendClubs(clubType, limit)); } diff --git a/backend/ruoyi-modules/ruoyi-stgl/src/main/java/org/dromara/stgl/controller/StglMaterialSubmissionController.java b/backend/ruoyi-modules/ruoyi-stgl/src/main/java/org/dromara/stgl/controller/StglMaterialSubmissionController.java index 228c5514..a3387a6c 100644 --- a/backend/ruoyi-modules/ruoyi-stgl/src/main/java/org/dromara/stgl/controller/StglMaterialSubmissionController.java +++ b/backend/ruoyi-modules/ruoyi-stgl/src/main/java/org/dromara/stgl/controller/StglMaterialSubmissionController.java @@ -64,7 +64,7 @@ public class StglMaterialSubmissionController extends BaseController { */ //@SaCheckPermission("stgl:activitymaterial:query") @GetMapping("/{id}") - public R getInfo(@NotNull(message = "主键不能为空") @PathVariable Long id) { + public R getInfo(@NotNull(message = "主键不能为空") @PathVariable("id") Long id) { return R.ok(materialSubmissionService.queryById(id)); } @@ -96,7 +96,7 @@ public class StglMaterialSubmissionController extends BaseController { //@SaCheckPermission("stgl:activitymaterial:remove") @Log(title = "材料提交记录", businessType = BusinessType.DELETE) @DeleteMapping("/{ids}") - public R remove(@NotEmpty(message = "主键不能为空") @PathVariable Long[] ids) { + public R remove(@NotEmpty(message = "主键不能为空") @PathVariable("ids") Long[] ids) { return toAjax(materialSubmissionService.deleteWithValidByIds(List.of(ids), true)); } @@ -116,7 +116,7 @@ public class StglMaterialSubmissionController extends BaseController { */ //@SaCheckPermission("stgl:activitymaterial:query") @GetMapping("/task/{taskId}") - public R> getByTaskId(@PathVariable Long taskId) { + public R> getByTaskId(@PathVariable("taskId") Long taskId) { List submissions = materialSubmissionService.queryByTaskId(taskId); return R.ok(submissions); } @@ -126,7 +126,7 @@ public class StglMaterialSubmissionController extends BaseController { */ //@SaCheckPermission("stgl:activitymaterial:query") @GetMapping("/task/{taskId}/user/{userId}") - public R getByTaskIdAndUserId(@PathVariable Long taskId, @PathVariable Long userId) { + public R getByTaskIdAndUserId(@PathVariable("taskId") Long taskId, @PathVariable("userId") Long userId) { StglMaterialSubmissionVo submission = materialSubmissionService.queryByTaskIdAndUserId(taskId, userId); return R.ok(submission); } @@ -136,7 +136,7 @@ public class StglMaterialSubmissionController extends BaseController { */ //@SaCheckPermission("stgl:activitymaterial:query") @GetMapping("/task/{taskId}/team/{teamId}") - public R getByTaskIdAndTeamId(@PathVariable Long taskId, @PathVariable Long teamId) { + public R getByTaskIdAndTeamId(@PathVariable("taskId") Long taskId, @PathVariable("teamId") Long teamId) { StglMaterialSubmissionVo submission = materialSubmissionService.queryByTaskIdAndTeamId(taskId, teamId); return R.ok(submission); } @@ -146,7 +146,7 @@ public class StglMaterialSubmissionController extends BaseController { */ //@SaCheckPermission("stgl:activitymaterial:query") @GetMapping("/statistics/{taskId}") - public R> getSubmissionStatistics(@PathVariable Long taskId) { + public R> getSubmissionStatistics(@PathVariable("taskId") Long taskId) { Map statistics = materialSubmissionService.getSubmissionStatistics(taskId); return R.ok(statistics); } @@ -157,9 +157,9 @@ public class StglMaterialSubmissionController extends BaseController { //@SaCheckPermission("stgl:activitymaterial:review") @Log(title = "材料审核", businessType = BusinessType.UPDATE) @PutMapping("/review/{id}") - public R reviewSubmission(@PathVariable Long id, - @RequestParam Integer reviewStatus, - @RequestParam(required = false) String reviewRemark) { + public R reviewSubmission(@PathVariable("id") Long id, + @RequestParam("reviewStatus") Integer reviewStatus, + @RequestParam(value = "reviewRemark", required = false) String reviewRemark) { if (reviewStatus != 1 && reviewStatus != 2) { return R.fail("审核状态参数错误,只能为1(通过)或2(驳回)"); } @@ -172,9 +172,9 @@ public class StglMaterialSubmissionController extends BaseController { //@SaCheckPermission("stgl:activitymaterial:review") @Log(title = "批量材料审核", businessType = BusinessType.UPDATE) @PutMapping("/review/batch") - public R batchReviewSubmissions(@RequestParam String ids, - @RequestParam Integer reviewStatus, - @RequestParam(required = false) String reviewRemark) { + public R batchReviewSubmissions(@RequestParam("ids") String ids, + @RequestParam("reviewStatus") Integer reviewStatus, + @RequestParam(value = "reviewRemark", required = false) String reviewRemark) { if (reviewStatus != 1 && reviewStatus != 2) { return R.fail("审核状态参数错误,只能为1(通过)或2(驳回)"); } diff --git a/backend/ruoyi-modules/ruoyi-stgl/src/main/java/org/dromara/stgl/controller/StglMaterialTaskController.java b/backend/ruoyi-modules/ruoyi-stgl/src/main/java/org/dromara/stgl/controller/StglMaterialTaskController.java index ee99c177..d24330c7 100644 --- a/backend/ruoyi-modules/ruoyi-stgl/src/main/java/org/dromara/stgl/controller/StglMaterialTaskController.java +++ b/backend/ruoyi-modules/ruoyi-stgl/src/main/java/org/dromara/stgl/controller/StglMaterialTaskController.java @@ -64,7 +64,7 @@ public class StglMaterialTaskController extends BaseController { */ //@SaCheckPermission("stgl:activitymaterial:query") @GetMapping("/{id}") - public R getInfo(@NotNull(message = "主键不能为空") @PathVariable Long id) { + public R getInfo(@NotNull(message = "主键不能为空") @PathVariable("id") Long id) { return R.ok(materialTaskService.queryById(id)); } @@ -96,7 +96,7 @@ public class StglMaterialTaskController extends BaseController { //@SaCheckPermission("stgl:activitymaterial:remove") @Log(title = "材料收集任务", businessType = BusinessType.DELETE) @DeleteMapping("/{ids}") - public R remove(@NotEmpty(message = "主键不能为空") @PathVariable Long[] ids) { + public R remove(@NotEmpty(message = "主键不能为空") @PathVariable("ids") Long[] ids) { return toAjax(materialTaskService.deleteWithValidByIds(List.of(ids), true)); } @@ -106,7 +106,7 @@ public class StglMaterialTaskController extends BaseController { //@SaCheckPermission("stgl:activitymaterial:status") @Log(title = "材料收集任务状态", businessType = BusinessType.UPDATE) @PutMapping("/status") - public R updateStatus(@RequestParam Long id, @RequestParam Integer taskStatus) { + public R updateStatus(@RequestParam("id") Long id, @RequestParam("taskStatus") Integer taskStatus) { if (taskStatus != 0 && taskStatus != 1) { return R.fail("任务状态参数错误"); } @@ -118,8 +118,8 @@ public class StglMaterialTaskController extends BaseController { */ //@SaCheckPermission("stgl:activitymaterial:upload") @GetMapping("/uploadable") - public R> getUploadableTasks(@RequestParam Long userId, - @RequestParam(required = false) Long activityId) { + public R> getUploadableTasks(@RequestParam("userId") Long userId, + @RequestParam(value = "activityId", required = false) Long activityId) { List tasks = materialTaskService.queryUploadableTasksByUser(userId, activityId); return R.ok(tasks); } @@ -129,7 +129,7 @@ public class StglMaterialTaskController extends BaseController { */ //@SaCheckPermission("stgl:activitymaterial:upload") @GetMapping("/validate") - public R validateUploadPermission(@RequestParam Long taskId, @RequestParam Long userId) { + public R validateUploadPermission(@RequestParam("taskId") Long taskId, @RequestParam("userId") Long userId) { Boolean hasPermission = materialTaskService.validateUploadPermission(taskId, userId); return R.ok(hasPermission); } @@ -139,7 +139,7 @@ public class StglMaterialTaskController extends BaseController { */ //@SaCheckPermission("stgl:activitymaterial:query") @GetMapping("/activity/{activityId}") - public R> getTasksByActivityId(@PathVariable Long activityId) { + public R> getTasksByActivityId(@PathVariable("activityId") Long activityId) { List tasks = materialTaskService.queryTasksByActivityId(activityId); return R.ok(tasks); } @@ -150,7 +150,7 @@ public class StglMaterialTaskController extends BaseController { //@SaCheckPermission("stgl:activitymaterial:edit") @Log(title = "材料收集任务统计", businessType = BusinessType.UPDATE) @PutMapping("/statistics/{taskId}") - public R updateStatistics(@PathVariable Long taskId) { + public R updateStatistics(@PathVariable("taskId") Long taskId) { return toAjax(materialTaskService.updateTaskStatistics(taskId)); } @@ -159,7 +159,7 @@ public class StglMaterialTaskController extends BaseController { */ //@SaCheckPermission("stgl:activitymaterial:query") @GetMapping("/activity/options") - public R> getActivityOptions(@RequestParam(required = false) String activityName) { + public R> getActivityOptions(@RequestParam(value = "activityName", required = false) String activityName) { List options = materialTaskService.queryActivityOptions(activityName); return R.ok(options); } diff --git a/backend/ruoyi-modules/ruoyi-stgl/src/main/java/org/dromara/stgl/controller/StglMemberController.java b/backend/ruoyi-modules/ruoyi-stgl/src/main/java/org/dromara/stgl/controller/StglMemberController.java index f079020e..913ad92f 100644 --- a/backend/ruoyi-modules/ruoyi-stgl/src/main/java/org/dromara/stgl/controller/StglMemberController.java +++ b/backend/ruoyi-modules/ruoyi-stgl/src/main/java/org/dromara/stgl/controller/StglMemberController.java @@ -88,7 +88,7 @@ public class StglMemberController extends BaseController { @Parameter(name = "id", description = "成员ID", required = true) }) public R getInfo(@NotNull(message = "主键不能为空") - @PathVariable Long id) { + @PathVariable("id") Long id) { return R.ok(stglMemberService.queryById(id)); } @@ -124,7 +124,7 @@ public class StglMemberController extends BaseController { @Log(title = "社团成员", businessType = BusinessType.DELETE) @DeleteMapping("/{ids}") public R remove(@NotEmpty(message = "主键不能为空") - @PathVariable Long[] ids) { + @PathVariable("ids") Long[] ids) { return toAjax(stglMemberService.deleteWithValidByIds(List.of(ids), true)); } @@ -141,10 +141,10 @@ public class StglMemberController extends BaseController { @Parameter(name = "userIds", description = "用户ID列表", required = true), @Parameter(name = "roleType", description = "角色类型", required = false) }) - public R batchAddMembers(@RequestParam Integer memberType, - @RequestParam Long relationId, - @RequestParam List userIds, - @RequestParam(required = false) Integer roleType) { + public R batchAddMembers(@RequestParam("memberType") Integer memberType, + @RequestParam("relationId") Long relationId, + @RequestParam("userIds") List userIds, + @RequestParam(value = "roleType", required = false) Integer roleType) { return toAjax(stglMemberService.batchAddMembers(memberType, relationId, userIds, roleType)); } @@ -159,7 +159,7 @@ public class StglMemberController extends BaseController { @Parameter(name = "id", description = "成员ID", required = true), @Parameter(name = "roleType", description = "角色类型", required = true) }) - public R updateMemberRole(@RequestParam Long id, @RequestParam Integer roleType) { + public R updateMemberRole(@RequestParam("id") Long id, @RequestParam("roleType") Integer roleType) { return toAjax(stglMemberService.updateMemberRole(id, roleType)); } @@ -174,7 +174,7 @@ public class StglMemberController extends BaseController { @Parameter(name = "id", description = "成员ID", required = true), @Parameter(name = "approved", description = "是否通过(true-通过,false-拒绝)", required = true) }) - public R approveMember(@PathVariable Long id, @RequestParam Boolean approved) { + public R approveMember(@PathVariable("id") Long id, @RequestParam("approved") Boolean approved) { return toAjax(stglMemberService.approveMember(id, approved)); } @@ -188,7 +188,7 @@ public class StglMemberController extends BaseController { @Parameters({ @Parameter(name = "id", description = "成员ID", required = true) }) - public R quitMember(@PathVariable Long id) { + public R quitMember(@PathVariable("id") Long id) { return toAjax(stglMemberService.quitMember(id)); } @@ -263,7 +263,7 @@ public class StglMemberController extends BaseController { */ @Operation(summary = "获取成员申请的审批流程") @GetMapping("/approvalFlow/{memberId}") - public R> getApprovalFlow(@PathVariable Long memberId) { + public R> getApprovalFlow(@PathVariable("memberId") Long memberId) { return R.ok(memberApprovalService.getApprovalFlow(memberId)); } @@ -272,7 +272,7 @@ public class StglMemberController extends BaseController { */ @Operation(summary = "获取待当前用户审批的成员列表") @GetMapping("/pendingApprovals") - public R> getPendingApprovals(@RequestParam(required = false) Long clubId) { + public R> getPendingApprovals(@RequestParam(value = "clubId", required = false) Long clubId) { return R.ok(memberApprovalService.getPendingApprovals(clubId)); } diff --git a/backend/ruoyi-modules/ruoyi-stgl/src/main/java/org/dromara/stgl/controller/StglMyController.java b/backend/ruoyi-modules/ruoyi-stgl/src/main/java/org/dromara/stgl/controller/StglMyController.java index f947f624..9a1707ce 100644 --- a/backend/ruoyi-modules/ruoyi-stgl/src/main/java/org/dromara/stgl/controller/StglMyController.java +++ b/backend/ruoyi-modules/ruoyi-stgl/src/main/java/org/dromara/stgl/controller/StglMyController.java @@ -65,9 +65,9 @@ public class StglMyController extends BaseController { //@SaCheckPermission("stgl:my:list") @GetMapping("/activities") public R> getMyActivities( - @Parameter(description = "活动名称") @RequestParam(required = false) String activityName, - @Parameter(description = "活动类型") @RequestParam(required = false) String activityType, - @Parameter(description = "是否评分") @RequestParam(required = false) String isRated) { + @Parameter(description = "活动名称") @RequestParam(value = "activityName", required = false) String activityName, + @Parameter(description = "活动类型") @RequestParam(value = "activityType", required = false) String activityType, + @Parameter(description = "是否评分") @RequestParam(value = "isRated", required = false) String isRated) { List list = stglMyService.queryMyActivities(activityName, activityType, isRated); return R.ok(list); } @@ -80,8 +80,8 @@ public class StglMyController extends BaseController { @GetMapping("/registrations") public TableDataInfo getMyRegistrations( @Parameter(description = "分页参数") PageQuery pageQuery, - @Parameter(description = "报名类型(1-社团 2-志愿团队 3-活动)") @RequestParam(required = false) String registrationType, - @Parameter(description = "名称(模糊查询)") @RequestParam(required = false) String name) { + @Parameter(description = "报名类型(1-社团 2-志愿团队 3-活动)") @RequestParam(value = "registrationType", required = false) String registrationType, + @Parameter(description = "名称(模糊查询)") @RequestParam(value = "name", required = false) String name) { return stglMyService.queryMyRegistrations(pageQuery, registrationType, name); } diff --git a/backend/ruoyi-modules/ruoyi-stgl/src/main/java/org/dromara/stgl/controller/StglVolunteerMemberController.java b/backend/ruoyi-modules/ruoyi-stgl/src/main/java/org/dromara/stgl/controller/StglVolunteerMemberController.java index 8a286fb3..55cc54ee 100644 --- a/backend/ruoyi-modules/ruoyi-stgl/src/main/java/org/dromara/stgl/controller/StglVolunteerMemberController.java +++ b/backend/ruoyi-modules/ruoyi-stgl/src/main/java/org/dromara/stgl/controller/StglVolunteerMemberController.java @@ -77,7 +77,7 @@ public class StglVolunteerMemberController extends BaseController { //@SaCheckPermission("stgl:volunteermember:query") @GetMapping("/{id}") public R getInfo(@NotNull(message = "主键不能为空") - @PathVariable Long id) { + @PathVariable("id") Long id) { return R.ok(stglMemberService.queryById(id)); } @@ -116,7 +116,7 @@ public class StglVolunteerMemberController extends BaseController { @Log(title = "志愿者成员", businessType = BusinessType.DELETE) @DeleteMapping("/{ids}") public R remove(@NotEmpty(message = "主键不能为空") - @PathVariable Long[] ids) { + @PathVariable("ids") Long[] ids) { return toAjax(stglMemberService.deleteWithValidByIds(List.of(ids), true)); } @@ -153,7 +153,7 @@ public class StglVolunteerMemberController extends BaseController { //@SaCheckPermission("stgl:volunteermember:list") @GetMapping("/team/{teamId}") public R> getTeamMembers(@NotNull(message = "队伍ID不能为空") - @PathVariable Long teamId) { + @PathVariable("teamId") Long teamId) { StglMemberBo bo = new StglMemberBo(); bo.setMemberType(2); // 志愿者成员 bo.setRelationId(teamId); @@ -228,8 +228,8 @@ public class StglVolunteerMemberController extends BaseController { @Log(title = "志愿者成员审核", businessType = BusinessType.UPDATE) @PutMapping("/approve/{id}") public R approveMember(@NotNull(message = "成员ID不能为空") - @PathVariable Long id, - @RequestParam Boolean approved) { + @PathVariable("id") Long id, + @RequestParam("approved") Boolean approved) { return toAjax(stglMemberService.approveMember(id, approved)); } } \ No newline at end of file diff --git a/backend/ruoyi-modules/ruoyi-stgl/src/main/java/org/dromara/stgl/controller/StglVolunteerTeamController.java b/backend/ruoyi-modules/ruoyi-stgl/src/main/java/org/dromara/stgl/controller/StglVolunteerTeamController.java index 887cb78d..3caf2543 100644 --- a/backend/ruoyi-modules/ruoyi-stgl/src/main/java/org/dromara/stgl/controller/StglVolunteerTeamController.java +++ b/backend/ruoyi-modules/ruoyi-stgl/src/main/java/org/dromara/stgl/controller/StglVolunteerTeamController.java @@ -69,7 +69,7 @@ public class StglVolunteerTeamController extends BaseController { */ // @SaCheckPermission("stgl:volunteerTeam:query") @GetMapping("/{id}") - public R getInfo(@PathVariable Long id) { + public R getInfo(@PathVariable("id") Long id) { return R.ok(stglVolunteerTeamService.queryById(id)); } @@ -101,7 +101,7 @@ public class StglVolunteerTeamController extends BaseController { // @SaCheckPermission("stgl:volunteerTeam:remove") @Log(title = "志愿者队伍", businessType = BusinessType.DELETE) @DeleteMapping("/{ids}") - public R remove(@PathVariable Long[] ids) { + public R remove(@PathVariable("ids") Long[] ids) { return toAjax(stglVolunteerTeamService.deleteWithValidByIds(List.of(ids), true)); } @@ -120,7 +120,7 @@ public class StglVolunteerTeamController extends BaseController { */ // @SaCheckPermission("stgl:volunteerTeam:list") @GetMapping("/byLeader/{leaderUserId}") - public R> getByLeaderUserId(@PathVariable Long leaderUserId) { + public R> getByLeaderUserId(@PathVariable("leaderUserId") Long leaderUserId) { List list = stglVolunteerTeamService.queryByLeaderUserId(leaderUserId); return R.ok(list); } @@ -130,7 +130,7 @@ public class StglVolunteerTeamController extends BaseController { */ // @SaCheckPermission("stgl:volunteerTeam:list") @GetMapping("/byType/{teamType}") - public R> getByTeamType(@PathVariable String teamType) { + public R> getByTeamType(@PathVariable("teamType") String teamType) { List list = stglVolunteerTeamService.queryByTeamType(teamType); return R.ok(list); } @@ -141,7 +141,7 @@ public class StglVolunteerTeamController extends BaseController { // @SaCheckPermission("stgl:volunteerTeam:edit") @Log(title = "志愿者队伍状态变更", businessType = BusinessType.UPDATE) @PutMapping("/status") - public R updateStatus(@RequestParam Long id, @RequestParam Integer status) { + public R updateStatus(@RequestParam("id") Long id, @RequestParam("status") Integer status) { return toAjax(stglVolunteerTeamService.updateStatus(id, status)); } @@ -214,7 +214,7 @@ public class StglVolunteerTeamController extends BaseController { */ // @SaCheckPermission("stgl:volunteerRegistration:query") @GetMapping("/registration/{id}") - public R getRegistrationInfo(@PathVariable Long id) { + public R getRegistrationInfo(@PathVariable("id") Long id) { StglVolunteerTeamVo vo = stglVolunteerTeamService.queryRegistrationById(id); return R.ok(vo); } @@ -270,7 +270,7 @@ public class StglVolunteerTeamController extends BaseController { */ // @SaCheckPermission("stgl:volunteerTeam:query") @GetMapping("/checkLeader/{id}") - public R checkTeamLeader(@PathVariable Long id) { + public R checkTeamLeader(@PathVariable("id") Long id) { Long currentUserId = LoginHelper.getUserId(); if (currentUserId == null) { return R.ok(false); @@ -286,7 +286,7 @@ public class StglVolunteerTeamController extends BaseController { @Log(title = "志愿者队伍转让", businessType = BusinessType.UPDATE) @RepeatSubmit() @PostMapping("/transfer/{id}") - public R transferVolunteerTeam(@PathVariable Long id, @RequestParam Long newLeaderUserId) { + public R transferVolunteerTeam(@PathVariable("id") Long id, @RequestParam("newLeaderUserId") Long newLeaderUserId) { // 验证当前用户是否为队长或管理员 Long currentUserId = LoginHelper.getUserId(); if (currentUserId == null) { @@ -310,7 +310,7 @@ public class StglVolunteerTeamController extends BaseController { // @SaCheckPermission("stgl:volunteerTeam:edit") @Log(title = "志愿者团队报名状态变更", businessType = BusinessType.UPDATE) @PutMapping("/changeSighOpenStatus") - public R changeSighOpenStatus(@RequestParam Long id, @RequestParam String sighOpen) { + public R changeSighOpenStatus(@RequestParam("id") Long id, @RequestParam("sighOpen") String sighOpen) { return toAjax(stglVolunteerTeamService.changeSighOpenStatus(id, sighOpen)); } } diff --git a/backend/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/controller/SysRegionController.java b/backend/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/controller/SysRegionController.java index 45f731c6..9e743f1f 100644 --- a/backend/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/controller/SysRegionController.java +++ b/backend/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/controller/SysRegionController.java @@ -67,7 +67,7 @@ public class SysRegionController extends BaseController { */ //@SaCheckPermission("system:SysRegion:query") @GetMapping("/{id}") - public R getInfo(@NotNull(message = "主键不能为空") @PathVariable Long id) { + public R getInfo(@NotNull(message = "主键不能为空") @PathVariable("id") Long id) { return R.ok(sysRegionService.queryById(id)); } @@ -101,7 +101,7 @@ public class SysRegionController extends BaseController { //@SaCheckPermission("system:SysRegion:remove") @Log(title = "行政区划", businessType = BusinessType.DELETE) @DeleteMapping("/{ids}") - public R remove(@NotEmpty(message = "主键不能为空") @PathVariable Long[] ids) { + public R remove(@NotEmpty(message = "主键不能为空") @PathVariable("ids") Long[] ids) { return toAjax(sysRegionService.deleteWithValidByIds(List.of(ids), true)); } diff --git a/backend/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/controller/SysTeacherController.java b/backend/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/controller/SysTeacherController.java index f338afb1..03c1207b 100644 --- a/backend/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/controller/SysTeacherController.java +++ b/backend/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/controller/SysTeacherController.java @@ -43,7 +43,7 @@ public class SysTeacherController extends BaseController { */ //@SaCheckPermission("system:teacher:list") @GetMapping("/search") - public R> searchByName(@RequestParam String name, + public R> searchByName(@RequestParam("name") String name, @RequestParam(defaultValue = "10") Integer limit) { List list = sysTeacherService.searchByName(name, limit); return R.ok(list); @@ -64,7 +64,7 @@ public class SysTeacherController extends BaseController { */ //@SaCheckPermission("system:teacher:list") @GetMapping("/dept/{deptId}") - public R> getTeachersByDeptId(@PathVariable Long deptId) { + public R> getTeachersByDeptId(@PathVariable("deptId") Long deptId) { List list = sysTeacherService.getTeachersByDeptId(deptId); return R.ok(list); } @@ -74,7 +74,7 @@ public class SysTeacherController extends BaseController { */ //@SaCheckPermission("system:teacher:query") @GetMapping("/{userId}") - public R getInfo(@PathVariable Long userId) { + public R getInfo(@PathVariable("userId") Long userId) { return R.ok(sysTeacherService.queryById(userId)); } } \ No newline at end of file diff --git a/backend/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/controller/monitor/SysLogininforController.java b/backend/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/controller/monitor/SysLogininforController.java index 98c3a1db..79ead66d 100644 --- a/backend/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/controller/monitor/SysLogininforController.java +++ b/backend/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/controller/monitor/SysLogininforController.java @@ -60,7 +60,7 @@ public class SysLogininforController extends BaseController { //@SaCheckPermission("monitor:logininfor:remove") @Log(title = "登录日志", businessType = BusinessType.DELETE) @DeleteMapping("/{infoIds}") - public R remove(@PathVariable Long[] infoIds) { + public R remove(@PathVariable("infoIds") Long[] infoIds) { return toAjax(logininforService.deleteLogininforByIds(infoIds)); } diff --git a/backend/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/controller/monitor/SysOperlogController.java b/backend/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/controller/monitor/SysOperlogController.java index ec35947a..6f10620a 100644 --- a/backend/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/controller/monitor/SysOperlogController.java +++ b/backend/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/controller/monitor/SysOperlogController.java @@ -58,7 +58,7 @@ public class SysOperlogController extends BaseController { @Log(title = "操作日志", businessType = BusinessType.DELETE) //@SaCheckPermission("monitor:operlog:remove") @DeleteMapping("/{operIds}") - public R remove(@PathVariable Long[] operIds) { + public R remove(@PathVariable("operIds") Long[] operIds) { return toAjax(operLogService.deleteOperLogByIds(operIds)); } diff --git a/backend/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/controller/monitor/SysUserOnlineController.java b/backend/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/controller/monitor/SysUserOnlineController.java index 880c0167..c6367d66 100644 --- a/backend/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/controller/monitor/SysUserOnlineController.java +++ b/backend/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/controller/monitor/SysUserOnlineController.java @@ -82,7 +82,7 @@ public class SysUserOnlineController extends BaseController { //@SaCheckPermission("monitor:online:forceLogout") @Log(title = "在线用户", businessType = BusinessType.FORCE) @DeleteMapping("/{tokenId}") - public R forceLogout(@PathVariable String tokenId) { + public R forceLogout(@PathVariable("tokenId") String tokenId) { try { StpUtil.kickoutByTokenValue(tokenId); } catch (NotLoginException ignored) { diff --git a/backend/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/controller/system/SysBucketPasswordController.java b/backend/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/controller/system/SysBucketPasswordController.java index 2d2e89fe..7ecf161e 100644 --- a/backend/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/controller/system/SysBucketPasswordController.java +++ b/backend/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/controller/system/SysBucketPasswordController.java @@ -58,7 +58,7 @@ public class SysBucketPasswordController extends BaseController { */ //@SaCheckPermission("system:bucket-password:query") @GetMapping("/info/{bucketName}") - public R getBucketPasswordInfo(@PathVariable String bucketName) { + public R getBucketPasswordInfo(@PathVariable("bucketName") String bucketName) { try { var passwordInfo = bucketPasswordService.getBucketPassword(bucketName); if (passwordInfo != null) { @@ -90,7 +90,7 @@ public class SysBucketPasswordController extends BaseController { //@SaCheckPermission("system:bucket-password:query") @GetMapping("/records/{bucketName}") public R getBucketAccessRecords( - @PathVariable String bucketName, + @PathVariable("bucketName") String bucketName, @RequestParam(defaultValue = "10") Integer limit) { try { diff --git a/backend/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/controller/system/SysClientController.java b/backend/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/controller/system/SysClientController.java index 42289ac0..9cd03e0c 100644 --- a/backend/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/controller/system/SysClientController.java +++ b/backend/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/controller/system/SysClientController.java @@ -64,7 +64,7 @@ public class SysClientController extends BaseController { //@SaCheckPermission("system:client:query") @GetMapping("/{id}") public R getInfo(@NotNull(message = "主键不能为空") - @PathVariable Long id) { + @PathVariable("id") Long id) { return R.ok(sysClientService.queryById(id)); } @@ -109,7 +109,7 @@ public class SysClientController extends BaseController { @Log(title = "客户端管理", businessType = BusinessType.DELETE) @DeleteMapping("/{ids}") public R remove(@NotEmpty(message = "主键不能为空") - @PathVariable Long[] ids) { + @PathVariable("ids") Long[] ids) { return toAjax(sysClientService.deleteWithValidByIds(List.of(ids), true)); } } diff --git a/backend/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/controller/system/SysConfigController.java b/backend/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/controller/system/SysConfigController.java index 9f184126..3f51f850 100644 --- a/backend/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/controller/system/SysConfigController.java +++ b/backend/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/controller/system/SysConfigController.java @@ -58,7 +58,7 @@ public class SysConfigController extends BaseController { */ //@SaCheckPermission("system:config:query") @GetMapping(value = "/{configId}") - public R getInfo(@PathVariable Long configId) { + public R getInfo(@PathVariable("configId") Long configId) { return R.ok(configService.selectConfigById(configId)); } @@ -68,7 +68,7 @@ public class SysConfigController extends BaseController { * @param configKey 参数Key */ @GetMapping(value = "/configKey/{configKey}") - public R getConfigKey(@PathVariable String configKey) { + public R getConfigKey(@PathVariable("configKey") String configKey) { return R.ok("操作成功", configService.selectConfigByKey(configKey)); } @@ -119,7 +119,7 @@ public class SysConfigController extends BaseController { //@SaCheckPermission("system:config:remove") @Log(title = "参数管理", businessType = BusinessType.DELETE) @DeleteMapping("/{configIds}") - public R remove(@PathVariable Long[] configIds) { + public R remove(@PathVariable("configIds") Long[] configIds) { configService.deleteConfigByIds(configIds); return R.ok(); } diff --git a/backend/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/controller/system/SysDeptController.java b/backend/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/controller/system/SysDeptController.java index d54154b2..7460be2b 100644 --- a/backend/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/controller/system/SysDeptController.java +++ b/backend/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/controller/system/SysDeptController.java @@ -63,7 +63,7 @@ public class SysDeptController extends BaseController { */ //@SaCheckPermission("system:dept:query") @GetMapping(value = "/{deptId}") - public R getInfo(@PathVariable Long deptId) { + public R getInfo(@PathVariable("deptId") Long deptId) { deptService.checkDeptDataScope(deptId); return R.ok(deptService.selectDeptById(deptId)); } @@ -112,7 +112,7 @@ public class SysDeptController extends BaseController { //@SaCheckPermission("system:dept:remove") @Log(title = "部门管理", businessType = BusinessType.DELETE) @DeleteMapping("/{deptId}") - public R remove(@PathVariable Long deptId) { + public R remove(@PathVariable("deptId") Long deptId) { if (deptService.hasChildByDeptId(deptId)) { return R.warn("存在下级部门,不允许删除"); } @@ -133,7 +133,7 @@ public class SysDeptController extends BaseController { */ //@SaCheckPermission("system:dept:query") @GetMapping("/optionselect") - public R> optionselect(@RequestParam(required = false) Long[] deptIds) { + public R> optionselect(@RequestParam(value = "deptIds", required = false) Long[] deptIds) { return R.ok(deptService.selectDeptByIds(deptIds == null ? null : List.of(deptIds))); } diff --git a/backend/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/controller/system/SysDictDataController.java b/backend/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/controller/system/SysDictDataController.java index 5f303252..a7ca0621 100644 --- a/backend/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/controller/system/SysDictDataController.java +++ b/backend/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/controller/system/SysDictDataController.java @@ -62,7 +62,7 @@ public class SysDictDataController extends BaseController { */ //@SaCheckPermission("system:dict:query") @GetMapping(value = "/{dictCode}") - public R getInfo(@PathVariable Long dictCode) { + public R getInfo(@PathVariable("dictCode") Long dictCode) { return R.ok(dictDataService.selectDictDataById(dictCode)); } @@ -72,7 +72,7 @@ public class SysDictDataController extends BaseController { * @param dictType 字典类型 */ @GetMapping(value = "/type/{dictType}") - public R> dictType(@PathVariable String dictType) { + public R> dictType(@PathVariable("dictType") String dictType) { List data = dictTypeService.selectDictDataByType(dictType); if (ObjectUtil.isNull(data)) { data = new ArrayList<>(); @@ -116,7 +116,7 @@ public class SysDictDataController extends BaseController { //@SaCheckPermission("system:dict:remove") @Log(title = "字典类型", businessType = BusinessType.DELETE) @DeleteMapping("/{dictCodes}") - public R remove(@PathVariable Long[] dictCodes) { + public R remove(@PathVariable("dictCodes") Long[] dictCodes) { dictDataService.deleteDictDataByIds(dictCodes); return R.ok(); } diff --git a/backend/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/controller/system/SysDictTypeController.java b/backend/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/controller/system/SysDictTypeController.java index fd4cfe42..8d4ca842 100644 --- a/backend/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/controller/system/SysDictTypeController.java +++ b/backend/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/controller/system/SysDictTypeController.java @@ -58,7 +58,7 @@ public class SysDictTypeController extends BaseController { */ //@SaCheckPermission("system:dict:query") @GetMapping(value = "/{dictId}") - public R getInfo(@PathVariable Long dictId) { + public R getInfo(@PathVariable("dictId") Long dictId) { return R.ok(dictTypeService.selectDictTypeById(dictId)); } @@ -98,7 +98,7 @@ public class SysDictTypeController extends BaseController { //@SaCheckPermission("system:dict:remove") @Log(title = "字典类型", businessType = BusinessType.DELETE) @DeleteMapping("/{dictIds}") - public R remove(@PathVariable Long[] dictIds) { + public R remove(@PathVariable("dictIds") Long[] dictIds) { dictTypeService.deleteDictTypeByIds(dictIds); return R.ok(); } diff --git a/backend/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/controller/system/SysFileAccessController.java b/backend/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/controller/system/SysFileAccessController.java index 1cfb3d29..4a3e396d 100644 --- a/backend/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/controller/system/SysFileAccessController.java +++ b/backend/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/controller/system/SysFileAccessController.java @@ -46,8 +46,8 @@ public class SysFileAccessController extends BaseController { */ @GetMapping("/access/{ossId}") public R getFileAccessUrl( - @PathVariable Long ossId, - @RequestParam(required = false) String bucketPassword, + @PathVariable("ossId") Long ossId, + @RequestParam(value = "bucketPassword", required = false) String bucketPassword, @RequestParam(defaultValue = "300") Integer expireSeconds, HttpServletRequest request) { @@ -106,7 +106,7 @@ public class SysFileAccessController extends BaseController { @PostMapping("/access/batch") public R> getBatchFileAccessUrl( @RequestBody List ossIds, - @RequestParam(required = false) String bucketPassword, + @RequestParam(value = "bucketPassword", required = false) String bucketPassword, @RequestParam(defaultValue = "300") Integer expireSeconds, HttpServletRequest request) { @@ -158,8 +158,8 @@ public class SysFileAccessController extends BaseController { */ @GetMapping("/download/{ossId}") public R getFileDownloadUrl( - @PathVariable Long ossId, - @RequestParam(required = false) String bucketPassword, + @PathVariable("ossId") Long ossId, + @RequestParam(value = "bucketPassword", required = false) String bucketPassword, @RequestParam(defaultValue = "300") Integer expireSeconds, HttpServletRequest request) { @@ -212,8 +212,8 @@ public class SysFileAccessController extends BaseController { */ @GetMapping("/preview/{ossId}") public R getFilePreviewUrl( - @PathVariable Long ossId, - @RequestParam(required = false) String bucketPassword, + @PathVariable("ossId") Long ossId, + @RequestParam(value = "bucketPassword", required = false) String bucketPassword, @RequestParam(defaultValue = "300") Integer expireSeconds, HttpServletRequest request) { diff --git a/backend/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/controller/system/SysMenuController.java b/backend/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/controller/system/SysMenuController.java index 15226db1..ef28f3cb 100644 --- a/backend/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/controller/system/SysMenuController.java +++ b/backend/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/controller/system/SysMenuController.java @@ -72,7 +72,7 @@ public class SysMenuController extends BaseController { }, mode = SaMode.OR) //@SaCheckPermission("system:menu:query") @GetMapping(value = "/{menuId}") - public R getInfo(@PathVariable Long menuId) { + public R getInfo(@PathVariable("menuId") Long menuId) { return R.ok(menuService.selectMenuById(menuId)); } diff --git a/backend/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/controller/system/SysNoticeController.java b/backend/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/controller/system/SysNoticeController.java index 45f6ab4e..fcb9ac25 100644 --- a/backend/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/controller/system/SysNoticeController.java +++ b/backend/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/controller/system/SysNoticeController.java @@ -46,7 +46,7 @@ public class SysNoticeController extends BaseController { */ //@SaCheckPermission("system:notice:query") @GetMapping(value = "/{noticeId}") - public R getInfo(@PathVariable Long noticeId) { + public R getInfo(@PathVariable("noticeId") Long noticeId) { return R.ok(noticeService.selectNoticeById(noticeId)); } @@ -84,7 +84,7 @@ public class SysNoticeController extends BaseController { //@SaCheckPermission("system:notice:remove") @Log(title = "通知公告", businessType = BusinessType.DELETE) @DeleteMapping("/{noticeIds}") - public R remove(@PathVariable Long[] noticeIds) { + public R remove(@PathVariable("noticeIds") Long[] noticeIds) { return toAjax(noticeService.deleteNoticeByIds(noticeIds)); } } diff --git a/backend/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/controller/system/SysOssConfigController.java b/backend/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/controller/system/SysOssConfigController.java index 87457135..8ef0a94f 100644 --- a/backend/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/controller/system/SysOssConfigController.java +++ b/backend/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/controller/system/SysOssConfigController.java @@ -54,7 +54,7 @@ public class SysOssConfigController extends BaseController { //@SaCheckPermission("system:ossConfig:list") @GetMapping("/{ossConfigId}") public R getInfo(@NotNull(message = "主键不能为空") - @PathVariable Long ossConfigId) { + @PathVariable("ossConfigId") Long ossConfigId) { return R.ok(ossConfigService.queryById(ossConfigId)); } @@ -89,7 +89,7 @@ public class SysOssConfigController extends BaseController { @Log(title = "对象存储配置", businessType = BusinessType.DELETE) @DeleteMapping("/{ossConfigIds}") public R remove(@NotEmpty(message = "主键不能为空") - @PathVariable Long[] ossConfigIds) { + @PathVariable("ossConfigIds") Long[] ossConfigIds) { return toAjax(ossConfigService.deleteWithValidByIds(List.of(ossConfigIds), true)); } diff --git a/backend/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/controller/system/SysOssController.java b/backend/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/controller/system/SysOssController.java index 58b0bb28..dceb091a 100644 --- a/backend/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/controller/system/SysOssController.java +++ b/backend/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/controller/system/SysOssController.java @@ -60,7 +60,7 @@ public class SysOssController extends BaseController { */ //@SaCheckPermission("system:oss:query") @GetMapping("/listByIds/{ossIds}") - public R> listByIds(@NotEmpty(message = "主键不能为空") @PathVariable Long[] ossIds) { + public R> listByIds(@NotEmpty(message = "主键不能为空") @PathVariable("ossIds") Long[] ossIds) { List list = ossService.listByIds(Arrays.asList(ossIds)); return R.ok(list); } @@ -155,7 +155,7 @@ public class SysOssController extends BaseController { //@SaCheckPermission("system:oss:remove") @Log(title = "OSS对象存储", businessType = BusinessType.DELETE) @DeleteMapping("/{ossIds}") - public R remove(@NotEmpty(message = "主键不能为空") @PathVariable Long[] ossIds) { + public R remove(@NotEmpty(message = "主键不能为空") @PathVariable("ossIds") Long[] ossIds) { return toAjax(ossService.deleteWithValidByIds(List.of(ossIds), true)); } @@ -191,7 +191,7 @@ public class SysOssController extends BaseController { //@SaCheckPermission("system:oss:cache:remove") @Log(title = "文件缓存管理", businessType = BusinessType.DELETE) @DeleteMapping("/cache/{ossId}") - public R removeFromCache(@PathVariable Long ossId) { + public R removeFromCache(@PathVariable("ossId") Long ossId) { ossService.removeFromCache(ossId); return R.ok("文件缓存已移除"); } diff --git a/backend/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/controller/system/SysPostController.java b/backend/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/controller/system/SysPostController.java index a71d16b5..e15f28cd 100644 --- a/backend/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/controller/system/SysPostController.java +++ b/backend/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/controller/system/SysPostController.java @@ -61,7 +61,7 @@ public class SysPostController extends BaseController { */ //@SaCheckPermission("system:post:query") @GetMapping(value = "/{postId}") - public R getInfo(@PathVariable Long postId) { + public R getInfo(@PathVariable("postId") Long postId) { return R.ok(postService.selectPostById(postId)); } @@ -106,7 +106,7 @@ public class SysPostController extends BaseController { //@SaCheckPermission("system:post:remove") @Log(title = "岗位管理", businessType = BusinessType.DELETE) @DeleteMapping("/{postIds}") - public R remove(@PathVariable Long[] postIds) { + public R remove(@PathVariable("postIds") Long[] postIds) { return toAjax(postService.deletePostByIds(postIds)); } @@ -118,7 +118,7 @@ public class SysPostController extends BaseController { */ //@SaCheckPermission("system:post:query") @GetMapping("/optionselect") - public R> optionselect(@RequestParam(required = false) Long[] postIds, @RequestParam(required = false) Long deptId) { + public R> optionselect(@RequestParam(value = "postIds", required = false) Long[] postIds, @RequestParam(value = "deptId", required = false) Long deptId) { List list = new ArrayList<>(); if (ObjectUtil.isNotNull(deptId)) { SysPostBo post = new SysPostBo(); diff --git a/backend/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/controller/system/SysRoleController.java b/backend/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/controller/system/SysRoleController.java index 690b33c7..eab93199 100644 --- a/backend/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/controller/system/SysRoleController.java +++ b/backend/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/controller/system/SysRoleController.java @@ -67,7 +67,7 @@ public class SysRoleController extends BaseController { */ //@SaCheckPermission("system:role:query") @GetMapping(value = "/{roleId}") - public R getInfo(@PathVariable Long roleId) { + public R getInfo(@PathVariable("roleId") Long roleId) { roleService.checkRoleDataScope(roleId); return R.ok(roleService.selectRoleById(roleId)); } @@ -143,7 +143,7 @@ public class SysRoleController extends BaseController { //@SaCheckPermission("system:role:remove") @Log(title = "角色管理", businessType = BusinessType.DELETE) @DeleteMapping("/{roleIds}") - public R remove(@PathVariable Long[] roleIds) { + public R remove(@PathVariable("roleIds") Long[] roleIds) { return toAjax(roleService.deleteRoleByIds(roleIds)); } @@ -154,7 +154,7 @@ public class SysRoleController extends BaseController { */ //@SaCheckPermission("system:role:query") @GetMapping("/optionselect") - public R> optionselect(@RequestParam(required = false) Long[] roleIds) { + public R> optionselect(@RequestParam(value = "roleIds", required = false) Long[] roleIds) { return R.ok(roleService.selectRoleByIds(roleIds == null ? null : List.of(roleIds))); } @@ -195,7 +195,7 @@ public class SysRoleController extends BaseController { //@SaCheckPermission("system:role:edit") @Log(title = "角色管理", businessType = BusinessType.GRANT) @PutMapping("/authUser/cancelAll") - public R cancelAuthUserAll(Long roleId, Long[] userIds) { + public R cancelAuthUserAll(@RequestParam("roleId") Long roleId, @RequestParam("userIds") Long[] userIds) { return toAjax(roleService.deleteAuthUsers(roleId, userIds)); } @@ -208,7 +208,7 @@ public class SysRoleController extends BaseController { //@SaCheckPermission("system:role:edit") @Log(title = "角色管理", businessType = BusinessType.GRANT) @PutMapping("/authUser/selectAll") - public R selectAuthUserAll(Long roleId, Long[] userIds) { + public R selectAuthUserAll(@RequestParam("roleId") Long roleId, @RequestParam("userIds") Long[] userIds) { roleService.checkRoleDataScope(roleId); return toAjax(roleService.insertAuthUsers(roleId, userIds)); } diff --git a/backend/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/controller/system/SysTenantController.java b/backend/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/controller/system/SysTenantController.java index 9edde784..a861c1fb 100644 --- a/backend/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/controller/system/SysTenantController.java +++ b/backend/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/controller/system/SysTenantController.java @@ -75,7 +75,7 @@ public class SysTenantController extends BaseController { //@SaCheckPermission("system:tenant:query") @GetMapping("/{id}") public R getInfo(@NotNull(message = "主键不能为空") - @PathVariable Long id) { + @PathVariable("id") Long id) { return R.ok(tenantService.queryById(id)); } @@ -134,7 +134,7 @@ public class SysTenantController extends BaseController { @Log(title = "租户管理", businessType = BusinessType.DELETE) @DeleteMapping("/{ids}") public R remove(@NotEmpty(message = "主键不能为空") - @PathVariable Long[] ids) { + @PathVariable("ids") Long[] ids) { return toAjax(tenantService.deleteWithValidByIds(List.of(ids), true)); } @@ -145,7 +145,7 @@ public class SysTenantController extends BaseController { */ @SaCheckRole(TenantConstants.SUPER_ADMIN_ROLE_KEY) @GetMapping("/dynamic/{tenantId}") - public R dynamicTenant(@NotBlank(message = "租户ID不能为空") @PathVariable String tenantId) { + public R dynamicTenant(@NotBlank(message = "租户ID不能为空") @PathVariable("tenantId") String tenantId) { TenantHelper.setDynamic(tenantId, true); return R.ok(); } diff --git a/backend/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/controller/system/SysTenantPackageController.java b/backend/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/controller/system/SysTenantPackageController.java index d660e020..8fbe2f75 100644 --- a/backend/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/controller/system/SysTenantPackageController.java +++ b/backend/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/controller/system/SysTenantPackageController.java @@ -81,7 +81,7 @@ public class SysTenantPackageController extends BaseController { //@SaCheckPermission("system:tenantPackage:query") @GetMapping("/{packageId}") public R getInfo(@NotNull(message = "主键不能为空") - @PathVariable Long packageId) { + @PathVariable("packageId") Long packageId) { return R.ok(tenantPackageService.queryById(packageId)); } @@ -136,7 +136,7 @@ public class SysTenantPackageController extends BaseController { @Log(title = "租户套餐", businessType = BusinessType.DELETE) @DeleteMapping("/{packageIds}") public R remove(@NotEmpty(message = "主键不能为空") - @PathVariable Long[] packageIds) { + @PathVariable("packageIds") Long[] packageIds) { return toAjax(tenantPackageService.deleteWithValidByIds(List.of(packageIds), true)); } } diff --git a/backend/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/controller/system/SysUserController.java b/backend/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/controller/system/SysUserController.java index a1bd64e0..d866a48b 100644 --- a/backend/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/controller/system/SysUserController.java +++ b/backend/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/controller/system/SysUserController.java @@ -213,7 +213,7 @@ public class SysUserController extends BaseController { //@SaCheckPermission("system:user:remove") @Log(title = "用户管理", businessType = BusinessType.DELETE) @DeleteMapping("/{userIds}") - public R remove(@PathVariable Long[] userIds) { + public R remove(@PathVariable("userIds") Long[] userIds) { if (ArrayUtil.contains(userIds, LoginHelper.getUserId())) { return R.fail("当前用户不能删除"); } @@ -228,8 +228,8 @@ public class SysUserController extends BaseController { */ //@SaCheckPermission("system:user:query") @GetMapping("/optionselect") - public R> optionselect(@RequestParam(required = false) Long[] userIds, - @RequestParam(required = false) Long deptId) { + public R> optionselect(@RequestParam(value = "userIds", required = false) Long[] userIds, + @RequestParam(value = "deptId", required = false) Long deptId) { return R.ok(userService.selectUserByIds(ArrayUtil.isEmpty(userIds) ? null : List.of(userIds), deptId)); } @@ -266,7 +266,7 @@ public class SysUserController extends BaseController { */ //@SaCheckPermission("system:user:query") @GetMapping("/authRole/{userId}") - public R authRole(@PathVariable Long userId) { + public R authRole(@PathVariable("userId") Long userId) { userService.checkUserDataScope(userId); SysUserVo user = userService.selectUserById(userId); List roles = roleService.selectRolesAuthByUserId(userId); @@ -286,7 +286,7 @@ public class SysUserController extends BaseController { //@SaCheckPermission("system:user:edit") @Log(title = "用户管理", businessType = BusinessType.GRANT) @PutMapping("/authRole") - public R insertAuthRole(Long userId, Long[] roleIds) { + public R insertAuthRole(@RequestParam("userId") Long userId, @RequestParam("roleIds") Long[] roleIds) { userService.checkUserDataScope(userId); userService.insertUserAuth(userId, roleIds); return R.ok(); diff --git a/backend/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/controller/wechat/SysWeChatController.java b/backend/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/controller/wechat/SysWeChatController.java index 3e652e4f..ee8b6595 100644 --- a/backend/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/controller/wechat/SysWeChatController.java +++ b/backend/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/controller/wechat/SysWeChatController.java @@ -80,7 +80,7 @@ public class SysWeChatController extends BaseController { //@SaCheckPermission("system:wechat:download") @Log(title = "微信媒体文件下载", businessType = BusinessType.OTHER) @GetMapping("/download") - public R downloadWeChatMedia(@RequestParam String mediaId) { + public R downloadWeChatMedia(@RequestParam("mediaId") String mediaId) { log.info("下载微信媒体文件,mediaId: {}", mediaId); try { @@ -101,7 +101,7 @@ public class SysWeChatController extends BaseController { //@SaCheckPermission("system:wechat:userinfo") @Log(title = "获取微信用户信息", businessType = BusinessType.OTHER) @GetMapping("/userinfo") - public R getWeChatUserInfo(@RequestParam String code) { + public R getWeChatUserInfo(@RequestParam("code") String code) { log.info("获取微信用户信息,code: {}", code); try { @@ -143,7 +143,7 @@ public class SysWeChatController extends BaseController { //@SaCheckPermission("system:wechat:pay") @Log(title = "查询微信支付状态", businessType = BusinessType.OTHER) @GetMapping("/pay/query") - public R queryWeChatPayStatus(@RequestParam String orderId) { + public R queryWeChatPayStatus(@RequestParam("orderId") String orderId) { log.info("查询微信支付状态,orderId: {}", orderId); try { @@ -164,7 +164,7 @@ public class SysWeChatController extends BaseController { //@SaCheckPermission("system:wechat:downloadToOss") @Log(title = "下载微信媒体文件到OSS", businessType = BusinessType.OTHER) @GetMapping("/downloadToOss") - public R downloadWeChatMediaToOss(@RequestParam String mediaId) { + public R downloadWeChatMediaToOss(@RequestParam("mediaId") String mediaId) { log.info("下载微信媒体文件到OSS,mediaId: {}", mediaId); try { diff --git a/backend/ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/controller/FlwCategoryController.java b/backend/ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/controller/FlwCategoryController.java index 3018b084..ac4dd418 100644 --- a/backend/ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/controller/FlwCategoryController.java +++ b/backend/ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/controller/FlwCategoryController.java @@ -65,7 +65,7 @@ public class FlwCategoryController extends BaseController { */ @SaCheckPermission("workflow:category:query") @GetMapping("/{categoryId}") - public R getInfo(@NotNull(message = "主键不能为空") @PathVariable Long categoryId) { + public R getInfo(@NotNull(message = "主键不能为空") @PathVariable("categoryId") Long categoryId) { flwCategoryService.checkCategoryDataScope(categoryId); return R.ok(flwCategoryService.queryById(categoryId)); } @@ -110,7 +110,7 @@ public class FlwCategoryController extends BaseController { @SaCheckPermission("workflow:category:remove") @Log(title = "流程分类", businessType = BusinessType.DELETE) @DeleteMapping("/{categoryId}") - public R remove(@PathVariable Long categoryId) { + public R remove(@PathVariable("categoryId") Long categoryId) { if (FlowConstant.FLOW_CATEGORY_ID.equals(categoryId)) { return R.warn("默认流程分类,不允许删除"); } diff --git a/backend/ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/controller/FlwDefinitionController.java b/backend/ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/controller/FlwDefinitionController.java index 10d9de83..315be297 100644 --- a/backend/ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/controller/FlwDefinitionController.java +++ b/backend/ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/controller/FlwDefinitionController.java @@ -66,7 +66,7 @@ public class FlwDefinitionController extends BaseController { * @param id 流程定义id */ @GetMapping(value = "/{id}") - public R getInfo(@PathVariable Long id) { + public R getInfo(@PathVariable("id") Long id) { return R.ok(defService.getById(id)); } @@ -104,7 +104,7 @@ public class FlwDefinitionController extends BaseController { @Log(title = "流程定义", businessType = BusinessType.INSERT) @PutMapping("/publish/{id}") @RepeatSubmit() - public R publish(@PathVariable Long id) { + public R publish(@PathVariable("id") Long id) { return R.ok(flwDefinitionService.publish(id)); } @@ -117,7 +117,7 @@ public class FlwDefinitionController extends BaseController { @PutMapping("/unPublish/{id}") @RepeatSubmit() @Transactional(rollbackFor = Exception.class) - public R unPublish(@PathVariable Long id) { + public R unPublish(@PathVariable("id") Long id) { return R.ok(defService.unPublish(id)); } @@ -126,7 +126,7 @@ public class FlwDefinitionController extends BaseController { */ @Log(title = "流程定义", businessType = BusinessType.DELETE) @DeleteMapping("/{ids}") - public R remove(@PathVariable List ids) { + public R remove(@PathVariable("ids") List ids) { return toAjax(flwDefinitionService.removeDef(ids)); } @@ -139,7 +139,7 @@ public class FlwDefinitionController extends BaseController { @PostMapping("/copy/{id}") @RepeatSubmit() @Transactional(rollbackFor = Exception.class) - public R copy(@PathVariable Long id) { + public R copy(@PathVariable("id") Long id) { return R.ok(defService.copyDef(id)); } @@ -164,7 +164,7 @@ public class FlwDefinitionController extends BaseController { */ @Log(title = "流程定义", businessType = BusinessType.EXPORT) @PostMapping("/exportDef/{id}") - public void exportDef(@PathVariable Long id, HttpServletResponse response) throws IOException { + public void exportDef(@PathVariable("id") Long id, HttpServletResponse response) throws IOException { flwDefinitionService.exportDef(id, response); } @@ -174,7 +174,7 @@ public class FlwDefinitionController extends BaseController { * @param id 流程定义id */ @GetMapping("/xmlString/{id}") - public R xmlString(@PathVariable Long id) { + public R xmlString(@PathVariable("id") Long id) { return R.ok("操作成功", defService.exportJson(id)); } @@ -187,7 +187,7 @@ public class FlwDefinitionController extends BaseController { @RepeatSubmit() @PutMapping("/active/{id}") @Transactional(rollbackFor = Exception.class) - public R active(@PathVariable Long id, @RequestParam boolean active) { + public R active(@PathVariable("id") Long id, @RequestParam("active") boolean active) { return R.ok(active ? defService.active(id) : defService.unActive(id)); } diff --git a/backend/ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/controller/FlwInstanceController.java b/backend/ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/controller/FlwInstanceController.java index e7ea5e4c..5817c8db 100644 --- a/backend/ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/controller/FlwInstanceController.java +++ b/backend/ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/controller/FlwInstanceController.java @@ -64,7 +64,7 @@ public class FlwInstanceController extends BaseController { * @param businessId 业务id */ @GetMapping("/getInfo/{businessId}") - public R getInfo(@PathVariable Long businessId) { + public R getInfo(@PathVariable("businessId") Long businessId) { return R.ok(flwInstanceService.queryByBusinessId(businessId)); } @@ -74,7 +74,7 @@ public class FlwInstanceController extends BaseController { * @param businessIds 业务id */ @DeleteMapping("/deleteByBusinessIds/{businessIds}") - public R deleteByBusinessIds(@PathVariable List businessIds) { + public R deleteByBusinessIds(@PathVariable("businessIds") List businessIds) { return toAjax(flwInstanceService.deleteByBusinessIds(businessIds)); } @@ -84,7 +84,7 @@ public class FlwInstanceController extends BaseController { * @param instanceIds 实例id */ @DeleteMapping("/deleteByInstanceIds/{instanceIds}") - public R deleteByInstanceIds(@PathVariable List instanceIds) { + public R deleteByInstanceIds(@PathVariable("instanceIds") List instanceIds) { return toAjax(flwInstanceService.deleteByInstanceIds(instanceIds)); } @@ -107,7 +107,7 @@ public class FlwInstanceController extends BaseController { */ @RepeatSubmit() @PutMapping("/active/{id}") - public R active(@PathVariable Long id, @RequestParam boolean active) { + public R active(@PathVariable("id") Long id, @RequestParam("active") boolean active) { return R.ok(active ? insService.active(id) : insService.unActive(id)); } @@ -128,7 +128,7 @@ public class FlwInstanceController extends BaseController { * @param businessId 业务id */ @GetMapping("/flowHisTaskList/{businessId}") - public R> flowHisTaskList(@PathVariable String businessId) { + public R> flowHisTaskList(@PathVariable("businessId") String businessId) { return R.ok(flwInstanceService.flowHisTaskList(businessId)); } @@ -138,7 +138,7 @@ public class FlwInstanceController extends BaseController { * @param instanceId 流程实例id */ @GetMapping("/instanceVariable/{instanceId}") - public R> instanceVariable(@PathVariable Long instanceId) { + public R> instanceVariable(@PathVariable("instanceId") Long instanceId) { return R.ok(flwInstanceService.instanceVariable(instanceId)); } diff --git a/backend/ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/controller/FlwTaskController.java b/backend/ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/controller/FlwTaskController.java index 5534b673..108f031e 100644 --- a/backend/ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/controller/FlwTaskController.java +++ b/backend/ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/controller/FlwTaskController.java @@ -124,7 +124,7 @@ public class FlwTaskController extends BaseController { * @param taskId 任务id */ @GetMapping("/getTask/{taskId}") - public R getTask(@PathVariable Long taskId) { + public R getTask(@PathVariable("taskId") Long taskId) { return R.ok(flwTaskService.selectById(taskId)); } @@ -159,7 +159,7 @@ public class FlwTaskController extends BaseController { @Log(title = "任务管理", businessType = BusinessType.UPDATE) @RepeatSubmit @PostMapping("/taskOperation/{taskOperation}") - public R taskOperation(@Validated @RequestBody TaskOperationBo bo, @PathVariable String taskOperation) { + public R taskOperation(@Validated @RequestBody TaskOperationBo bo, @PathVariable("taskOperation") String taskOperation) { return toAjax(flwTaskService.taskOperation(bo, taskOperation)); } @@ -172,7 +172,7 @@ public class FlwTaskController extends BaseController { @Log(title = "任务管理", businessType = BusinessType.UPDATE) @RepeatSubmit() @PutMapping("/updateAssignee/{userId}") - public R updateAssignee(@RequestBody List taskIdList, @PathVariable String userId) { + public R updateAssignee(@RequestBody List taskIdList, @PathVariable("userId") String userId) { return toAjax(flwTaskService.updateAssignee(taskIdList, userId)); } @@ -195,7 +195,7 @@ public class FlwTaskController extends BaseController { * @param nowNodeCode 当前节点 */ @GetMapping("/getBackTaskNode/{definitionId}/{nowNodeCode}") - public R> getBackTaskNode(@PathVariable Long definitionId, @PathVariable String nowNodeCode) { + public R> getBackTaskNode(@PathVariable("definitionId") Long definitionId, @PathVariable("nowNodeCode") String nowNodeCode) { return R.ok(flwTaskService.getBackTaskNode(definitionId, nowNodeCode)); } @@ -205,7 +205,7 @@ public class FlwTaskController extends BaseController { * @param taskId 任务id */ @GetMapping("/currentTaskAllUser/{taskId}") - public R> currentTaskAllUser(@PathVariable Long taskId) { + public R> currentTaskAllUser(@PathVariable("taskId") Long taskId) { return R.ok(flwTaskService.currentTaskAllUser(taskId)); } diff --git a/backend/ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/controller/TestLeaveController.java b/backend/ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/controller/TestLeaveController.java index 610dc198..bb63dce5 100644 --- a/backend/ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/controller/TestLeaveController.java +++ b/backend/ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/controller/TestLeaveController.java @@ -66,7 +66,7 @@ public class TestLeaveController extends BaseController { */ @SaCheckPermission("workflow:leave:query") @GetMapping("/{id}") - public R getInfo(@NotNull(message = "主键不能为空") @PathVariable Long id) { + public R getInfo(@NotNull(message = "主键不能为空") @PathVariable("id") Long id) { return R.ok(testLeaveService.queryById(id)); } @@ -100,7 +100,7 @@ public class TestLeaveController extends BaseController { @SaCheckPermission("workflow:leave:remove") @Log(title = "请假", businessType = BusinessType.DELETE) @DeleteMapping("/{ids}") - public R remove(@NotEmpty(message = "主键不能为空") @PathVariable Long[] ids) { + public R remove(@NotEmpty(message = "主键不能为空") @PathVariable("ids") Long[] ids) { return toAjax(testLeaveService.deleteWithValidByIds(List.of(ids))); } } diff --git a/backend/ruoyi-modules/ruoyi-xg/src/main/java/org/dromara/xg/controller/XgClassMsgController.java b/backend/ruoyi-modules/ruoyi-xg/src/main/java/org/dromara/xg/controller/XgClassMsgController.java index 47233fe5..b5f779c2 100644 --- a/backend/ruoyi-modules/ruoyi-xg/src/main/java/org/dromara/xg/controller/XgClassMsgController.java +++ b/backend/ruoyi-modules/ruoyi-xg/src/main/java/org/dromara/xg/controller/XgClassMsgController.java @@ -88,7 +88,7 @@ public class XgClassMsgController extends BaseController { */ // @SaCheckPermission("classMsg:classMsg:query") @GetMapping("/{id}") - public R getInfo(@NotNull(message = "主键不能为空") @PathVariable Long id) { + public R getInfo(@NotNull(message = "主键不能为空") @PathVariable("id") Long id) { return R.ok(xgClassMsgService.queryById(id)); } @@ -144,7 +144,7 @@ public class XgClassMsgController extends BaseController { // @SaCheckPermission("classMsg:classMsg:remove") @Log(title = "班级信息-新版", businessType = BusinessType.DELETE) @DeleteMapping("/{ids}") - public R remove(@NotEmpty(message = "主键不能为空") @PathVariable Long[] ids) { + public R remove(@NotEmpty(message = "主键不能为空") @PathVariable("ids") Long[] ids) { return toAjax(xgClassMsgService.deleteWithValidByIds(List.of(ids), true)); } diff --git a/backend/ruoyi-modules/ruoyi-xg/src/main/java/org/dromara/xg/controller/XgClassPosDictController.java b/backend/ruoyi-modules/ruoyi-xg/src/main/java/org/dromara/xg/controller/XgClassPosDictController.java index 3234b161..4da47094 100644 --- a/backend/ruoyi-modules/ruoyi-xg/src/main/java/org/dromara/xg/controller/XgClassPosDictController.java +++ b/backend/ruoyi-modules/ruoyi-xg/src/main/java/org/dromara/xg/controller/XgClassPosDictController.java @@ -63,7 +63,7 @@ public class XgClassPosDictController extends BaseController { */ // @SaCheckPermission("xgClassPosDict:xgClassPosDict:query") @GetMapping("/{id}") - public R getInfo(@NotNull(message = "主键不能为空") @PathVariable Long id) { + public R getInfo(@NotNull(message = "主键不能为空") @PathVariable("id") Long id) { return R.ok(xgClassPosDictService.queryById(id)); } @@ -97,7 +97,7 @@ public class XgClassPosDictController extends BaseController { // @SaCheckPermission("xgClassPosDict:xgClassPosDict:remove") @Log(title = "班级干部职务配置", businessType = BusinessType.DELETE) @DeleteMapping("/{ids}") - public R remove(@NotEmpty(message = "主键不能为空") @PathVariable Long[] ids) { + public R remove(@NotEmpty(message = "主键不能为空") @PathVariable("ids") Long[] ids) { return toAjax(xgClassPosDictService.deleteWithValidByIds(List.of(ids), true)); } @@ -109,7 +109,7 @@ public class XgClassPosDictController extends BaseController { */ // @SaCheckPermission("xgClassPosDict:xgClassPosDict:list") @GetMapping("/validPositions") - public R> getValidPositions(@RequestParam(required = false) String positionName) { + public R> getValidPositions(@RequestParam(value = "positionName", required = false) String positionName) { XgClassPosDictBo bo = new XgClassPosDictBo(); bo.setPositionName(positionName); bo.setStatus("0"); // 启用状态 diff --git a/backend/ruoyi-modules/ruoyi-xg/src/main/java/org/dromara/xg/controller/XgClassPosMsgController.java b/backend/ruoyi-modules/ruoyi-xg/src/main/java/org/dromara/xg/controller/XgClassPosMsgController.java index 4feb2f3b..cc2ef981 100644 --- a/backend/ruoyi-modules/ruoyi-xg/src/main/java/org/dromara/xg/controller/XgClassPosMsgController.java +++ b/backend/ruoyi-modules/ruoyi-xg/src/main/java/org/dromara/xg/controller/XgClassPosMsgController.java @@ -45,7 +45,7 @@ public class XgClassPosMsgController extends BaseController { // @SaCheckPermission("xgClassPosMsg:xgClassPosMsg:list") @GetMapping("/list") public TableDataInfo list(XgClassPosMsgBo bo, PageQuery pageQuery, - @RequestParam(required = false) Long deptId) { + @RequestParam(value = "deptId", required = false) Long deptId) { return xgClassPosMsgService.queryPageList(bo, pageQuery, deptId); } @@ -67,7 +67,7 @@ public class XgClassPosMsgController extends BaseController { */ // @SaCheckPermission("xgClassPosMsg:xgClassPosMsg:query") @GetMapping("/{id}") - public R getInfo(@NotNull(message = "主键不能为空") @PathVariable Long id) { + public R getInfo(@NotNull(message = "主键不能为空") @PathVariable("id") Long id) { return R.ok(xgClassPosMsgService.queryById(id)); } @@ -101,7 +101,7 @@ public class XgClassPosMsgController extends BaseController { // @SaCheckPermission("xgClassPosMsg:xgClassPosMsg:remove") @Log(title = "班级干部信息", businessType = BusinessType.DELETE) @DeleteMapping("/{ids}") - public R remove(@NotEmpty(message = "主键不能为空") @PathVariable Long[] ids) { + public R remove(@NotEmpty(message = "主键不能为空") @PathVariable("ids") Long[] ids) { return toAjax(xgClassPosMsgService.deleteWithValidByIds(List.of(ids), true)); } @@ -118,10 +118,10 @@ public class XgClassPosMsgController extends BaseController { @Log(title = "学生干部离任", businessType = BusinessType.UPDATE) @PostMapping("/dismiss/{id}") public R dismissCadre( - @NotNull(message = "班级干部信息ID不能为空") @PathVariable Long id, - @NotNull(message = "任期结束日期不能为空") @RequestParam Date termEndDate, - @NotBlank(message = "学生职务任职状态不能为空") @RequestParam String cadreStatus, - @NotBlank(message = "离任原因不能为空") @RequestParam String dismissalReason) { + @NotNull(message = "班级干部信息ID不能为空") @PathVariable("id") Long id, + @NotNull(message = "任期结束日期不能为空") @RequestParam("termEndDate") Date termEndDate, + @NotBlank(message = "学生职务任职状态不能为空") @RequestParam("cadreStatus") String cadreStatus, + @NotBlank(message = "离任原因不能为空") @RequestParam("dismissalReason") String dismissalReason) { return toAjax(xgClassPosMsgService.dismissCadre(id, termEndDate, cadreStatus, dismissalReason)); } } diff --git a/backend/ruoyi-modules/ruoyi-xg/src/main/java/org/dromara/xg/controller/XgClassTeacherCounselorRelController.java b/backend/ruoyi-modules/ruoyi-xg/src/main/java/org/dromara/xg/controller/XgClassTeacherCounselorRelController.java index b8ed6a03..e9ecde90 100644 --- a/backend/ruoyi-modules/ruoyi-xg/src/main/java/org/dromara/xg/controller/XgClassTeacherCounselorRelController.java +++ b/backend/ruoyi-modules/ruoyi-xg/src/main/java/org/dromara/xg/controller/XgClassTeacherCounselorRelController.java @@ -64,7 +64,7 @@ public class XgClassTeacherCounselorRelController extends BaseController { // @SaCheckPermission("teacherCounselorRel:classTeacherCounselorRel:query") @GetMapping("/{id}") public R getInfo(@NotNull(message = "主键不能为空") - @PathVariable Long id) { + @PathVariable("id") Long id) { return R.ok(xgClassTeacherCounselorRelService.queryById(id)); } @@ -99,7 +99,7 @@ public class XgClassTeacherCounselorRelController extends BaseController { @Log(title = "班级班主任辅导员关联", businessType = BusinessType.DELETE) @DeleteMapping("/{ids}") public R remove(@NotEmpty(message = "主键不能为空") - @PathVariable Long[] ids) { + @PathVariable("ids") Long[] ids) { return toAjax(xgClassTeacherCounselorRelService.deleteWithValidByIds(List.of(ids), true)); } } diff --git a/backend/ruoyi-modules/ruoyi-xg/src/main/java/org/dromara/xg/controller/XgCollegeLeaderController.java b/backend/ruoyi-modules/ruoyi-xg/src/main/java/org/dromara/xg/controller/XgCollegeLeaderController.java index cb393c93..a7b0b4c5 100644 --- a/backend/ruoyi-modules/ruoyi-xg/src/main/java/org/dromara/xg/controller/XgCollegeLeaderController.java +++ b/backend/ruoyi-modules/ruoyi-xg/src/main/java/org/dromara/xg/controller/XgCollegeLeaderController.java @@ -55,7 +55,7 @@ public class XgCollegeLeaderController extends BaseController { @Operation(summary = "根据学院ID查询分管领导列表") // @SaCheckPermission("xg:ejxyfgld:list") @GetMapping("/listByCollege/{collegeId}") - public R> listByCollege(@PathVariable Long collegeId) { + public R> listByCollege(@PathVariable("collegeId") Long collegeId) { List list = xgCollegeLeaderService.queryByCollegeId(collegeId); return R.ok(list); } @@ -80,7 +80,7 @@ public class XgCollegeLeaderController extends BaseController { @Operation(summary = "获取二级学院分管领导配置详细信息") // @SaCheckPermission("xg:ejxyfgld:query") @GetMapping("/{id}") - public R getInfo(@NotNull(message = "主键不能为空") @PathVariable Long id) { + public R getInfo(@NotNull(message = "主键不能为空") @PathVariable("id") Long id) { return R.ok(xgCollegeLeaderService.queryById(id)); } @@ -117,7 +117,7 @@ public class XgCollegeLeaderController extends BaseController { // @SaCheckPermission("xg:ejxyfgld:remove") @Log(title = "二级学院分管领导配置", businessType = BusinessType.DELETE) @DeleteMapping("/{ids}") - public R remove(@NotEmpty(message = "主键不能为空") @PathVariable Long[] ids) { + public R remove(@NotEmpty(message = "主键不能为空") @PathVariable("ids") Long[] ids) { return toAjax(xgCollegeLeaderService.deleteWithValidByIds(List.of(ids), true)); } } diff --git a/backend/ruoyi-modules/ruoyi-xg/src/main/java/org/dromara/xg/controller/XgConductScoreAuditController.java b/backend/ruoyi-modules/ruoyi-xg/src/main/java/org/dromara/xg/controller/XgConductScoreAuditController.java index eff38c51..d587a9e3 100644 --- a/backend/ruoyi-modules/ruoyi-xg/src/main/java/org/dromara/xg/controller/XgConductScoreAuditController.java +++ b/backend/ruoyi-modules/ruoyi-xg/src/main/java/org/dromara/xg/controller/XgConductScoreAuditController.java @@ -52,7 +52,7 @@ public class XgConductScoreAuditController extends BaseController { */ // @SaCheckPermission("xg:conductScoreAudit:query") @GetMapping("/{id}") - public R getInfo(@NotNull(message = "主键不能为空") @PathVariable Long id) { + public R getInfo(@NotNull(message = "主键不能为空") @PathVariable("id") Long id) { return R.ok(xgConductScoreAuditService.queryById(id)); } @@ -62,7 +62,7 @@ public class XgConductScoreAuditController extends BaseController { // @SaCheckPermission("xg:conductScoreAudit:approve") @Log(title = "操行分审核", businessType = BusinessType.UPDATE) @PostMapping("/approve/{id}") - public R approve(@NotNull(message = "审核ID不能为空") @PathVariable Long id, + public R approve(@NotNull(message = "审核ID不能为空") @PathVariable("id") Long id, @Validated @RequestBody XgConductScoreAuditApproveBo bo) { return toAjax(xgConductScoreAuditService.approveAudit(id, bo)); } @@ -73,7 +73,7 @@ public class XgConductScoreAuditController extends BaseController { // @SaCheckPermission("xg:conductScoreAudit:reject") @Log(title = "操行分审核", businessType = BusinessType.UPDATE) @PostMapping("/reject/{id}") - public R reject(@NotNull(message = "审核ID不能为空") @PathVariable Long id, + public R reject(@NotNull(message = "审核ID不能为空") @PathVariable("id") Long id, @Validated @RequestBody XgConductScoreAuditRejectBo bo) { return toAjax(xgConductScoreAuditService.rejectAudit(id, bo)); } @@ -104,7 +104,7 @@ public class XgConductScoreAuditController extends BaseController { // @SaCheckPermission("xg:conductScoreAudit:remove") @Log(title = "操行分审核", businessType = BusinessType.DELETE) @DeleteMapping("/{ids}") - public R remove(@NotEmpty(message = "主键不能为空") @PathVariable Long[] ids) { + public R remove(@NotEmpty(message = "主键不能为空") @PathVariable("ids") Long[] ids) { return toAjax(xgConductScoreAuditService.deleteWithValidByIds(List.of(ids), true)); } diff --git a/backend/ruoyi-modules/ruoyi-xg/src/main/java/org/dromara/xg/controller/XgConductScoreController.java b/backend/ruoyi-modules/ruoyi-xg/src/main/java/org/dromara/xg/controller/XgConductScoreController.java index d953092c..64ee8675 100644 --- a/backend/ruoyi-modules/ruoyi-xg/src/main/java/org/dromara/xg/controller/XgConductScoreController.java +++ b/backend/ruoyi-modules/ruoyi-xg/src/main/java/org/dromara/xg/controller/XgConductScoreController.java @@ -62,7 +62,7 @@ public class XgConductScoreController extends BaseController { @NotNull(message = "学年不能为空") Integer academicYear, @NotNull(message = "学期不能为空") Integer semester, @NotNull(message = "月份不能为空") Integer month, - @RequestParam(required = false) List studentStatus, + @RequestParam(value = "studentStatus", required = false) List studentStatus, HttpServletRequest request) { // 兼容前端参数序列化 studentStatus[0]=1&studentStatus[1]=3 的情况 if ((studentStatus == null || studentStatus.isEmpty())) { @@ -233,7 +233,7 @@ public class XgConductScoreController extends BaseController { // @SaCheckPermission("xg:conductScore:export") @Log(title = "学生操行分", businessType = BusinessType.EXPORT) @PostMapping("/export") - public void export(@RequestParam Map requestBody, HttpServletResponse response) { + public void export(@RequestParam("requestBody") Map requestBody, HttpServletResponse response) { // 从请求体中解析查询条件 XgConductScoreQueryBo bo = new XgConductScoreQueryBo(); @@ -517,7 +517,7 @@ public class XgConductScoreController extends BaseController { // @SaCheckPermission("xg:conductScore:exportSemester") @Log(title = "学期平均分统计", businessType = BusinessType.EXPORT) @PostMapping("/export-semester") - public void exportSemester(@RequestParam Map requestBody, HttpServletResponse response) { + public void exportSemester(@RequestParam("requestBody") Map requestBody, HttpServletResponse response) { // 从请求体中解析查询条件 XgConductScoreQueryBo bo = new XgConductScoreQueryBo(); @@ -699,7 +699,7 @@ public class XgConductScoreController extends BaseController { // @SaCheckPermission("xg:conductScore:studentRecords") @GetMapping("/student-records/{studentId}") public R getStudentRecords( - @NotNull(message = "学生ID不能为空") @PathVariable Long studentId, + @NotNull(message = "学生ID不能为空") @PathVariable("studentId") Long studentId, Integer academicYear, Integer semester, String tenantId) { return R.ok(xgConductScoreService.getStudentRecords(studentId, academicYear, semester, tenantId)); } @@ -710,7 +710,7 @@ public class XgConductScoreController extends BaseController { // @SaCheckPermission("xg:conductScore:classDetail") @GetMapping("/class-detail/{classId}") public R getClassDetail( - @NotNull(message = "班级ID不能为空") @PathVariable Long classId, + @NotNull(message = "班级ID不能为空") @PathVariable("classId") Long classId, @NotNull(message = "学年不能为空") Integer academicYear, @NotNull(message = "学期不能为空") Integer semester) { return R.ok(xgConductScoreService.getClassDetailStatistics(classId, academicYear, semester)); @@ -723,7 +723,7 @@ public class XgConductScoreController extends BaseController { @RepeatSubmit() @Log(title = "学生操行分", businessType = BusinessType.UPDATE) @PutMapping("/{id}") - public R updateRecord(@NotNull(message = "记录ID不能为空") @PathVariable Long id, + public R updateRecord(@NotNull(message = "记录ID不能为空") @PathVariable("id") Long id, @Validated @RequestBody XgConductScoreBo bo) { return toAjax(xgConductScoreService.updateRecordById(id, bo)); } @@ -734,7 +734,7 @@ public class XgConductScoreController extends BaseController { // @SaCheckPermission("xg:conductScore:remove") @Log(title = "学生操行分", businessType = BusinessType.DELETE) @DeleteMapping("/{ids}") - public R remove(@NotEmpty(message = "主键不能为空") @PathVariable Long[] ids) { + public R remove(@NotEmpty(message = "主键不能为空") @PathVariable("ids") Long[] ids) { return toAjax(xgConductScoreService.deleteWithValidByIds(List.of(ids), true)); } diff --git a/backend/ruoyi-modules/ruoyi-xg/src/main/java/org/dromara/xg/controller/XgDormApplicationController.java b/backend/ruoyi-modules/ruoyi-xg/src/main/java/org/dromara/xg/controller/XgDormApplicationController.java index 90c0dbd8..e14539b9 100644 --- a/backend/ruoyi-modules/ruoyi-xg/src/main/java/org/dromara/xg/controller/XgDormApplicationController.java +++ b/backend/ruoyi-modules/ruoyi-xg/src/main/java/org/dromara/xg/controller/XgDormApplicationController.java @@ -76,7 +76,7 @@ public class XgDormApplicationController extends BaseController { */ // @SaCheckPermission("dormApplication:dormApplication:query") @GetMapping("/{id}") - public R getInfo(@NotNull(message = "主键不能为空") @PathVariable Long id) { + public R getInfo(@NotNull(message = "主键不能为空") @PathVariable("id") Long id) { return R.ok(xgDormApplicationService.queryById(id)); } @@ -111,7 +111,7 @@ public class XgDormApplicationController extends BaseController { // @SaCheckPermission("dormApplication:dormApplication:remove") @Log(title = "学生宿舍申请单表(调宿+退宿)", businessType = BusinessType.DELETE) @DeleteMapping("/{ids}") - public R remove(@NotEmpty(message = "主键不能为空") @PathVariable Long[] ids) { + public R remove(@NotEmpty(message = "主键不能为空") @PathVariable("ids") Long[] ids) { return toAjax(xgDormApplicationService.deleteWithValidByIds(List.of(ids), true)); } @@ -122,7 +122,7 @@ public class XgDormApplicationController extends BaseController { */ // @SaCheckPermission("dormApplication:dormApplication:list") @GetMapping("/getCollegeApprovers") - public R>> getCollegeApprovers(@RequestParam Long collegeId) { + public R>> getCollegeApprovers(@RequestParam("collegeId") Long collegeId) { List> approvers = xgDormApplicationService.getCollegeApprovers(collegeId); return R.ok(approvers); } diff --git a/backend/ruoyi-modules/ruoyi-xg/src/main/java/org/dromara/xg/controller/XgDormAreaController.java b/backend/ruoyi-modules/ruoyi-xg/src/main/java/org/dromara/xg/controller/XgDormAreaController.java index 23ed8754..869a3d8d 100644 --- a/backend/ruoyi-modules/ruoyi-xg/src/main/java/org/dromara/xg/controller/XgDormAreaController.java +++ b/backend/ruoyi-modules/ruoyi-xg/src/main/java/org/dromara/xg/controller/XgDormAreaController.java @@ -64,7 +64,7 @@ public class XgDormAreaController extends BaseController { */ // @SaCheckPermission("ssqxx:dormArea:query") @GetMapping("/{id}") - public R getInfo(@NotNull(message = "主键不能为空") @PathVariable Long id) { + public R getInfo(@NotNull(message = "主键不能为空") @PathVariable("id") Long id) { return R.ok(xgDormAreaService.queryById(id)); } @@ -98,7 +98,7 @@ public class XgDormAreaController extends BaseController { // @SaCheckPermission("ssqxx:dormArea:remove") @Log(title = "宿舍区信息", businessType = BusinessType.DELETE) @DeleteMapping("/{ids}") - public R remove(@NotEmpty(message = "主键不能为空") @PathVariable Long[] ids) { + public R remove(@NotEmpty(message = "主键不能为空") @PathVariable("ids") Long[] ids) { return toAjax(xgDormAreaService.deleteWithValidByIds(List.of(ids), true)); } diff --git a/backend/ruoyi-modules/ruoyi-xg/src/main/java/org/dromara/xg/controller/XgDormBedController.java b/backend/ruoyi-modules/ruoyi-xg/src/main/java/org/dromara/xg/controller/XgDormBedController.java index 151809fe..63a65c24 100644 --- a/backend/ruoyi-modules/ruoyi-xg/src/main/java/org/dromara/xg/controller/XgDormBedController.java +++ b/backend/ruoyi-modules/ruoyi-xg/src/main/java/org/dromara/xg/controller/XgDormBedController.java @@ -64,7 +64,7 @@ public class XgDormBedController extends BaseController { */ // @SaCheckPermission("dormbed:dormBed:query") @GetMapping("/{id}") - public R getInfo(@NotNull(message = "主键不能为空") @PathVariable Long id) { + public R getInfo(@NotNull(message = "主键不能为空") @PathVariable("id") Long id) { return R.ok(xgDormBedService.queryById(id)); } @@ -98,7 +98,7 @@ public class XgDormBedController extends BaseController { // @SaCheckPermission("dormbed:dormBed:remove") @Log(title = "宿舍床位信息", businessType = BusinessType.DELETE) @DeleteMapping("/{ids}") - public R remove(@NotEmpty(message = "主键不能为空") @PathVariable Long[] ids) { + public R remove(@NotEmpty(message = "主键不能为空") @PathVariable("ids") Long[] ids) { return toAjax(xgDormBedService.deleteWithValidByIds(List.of(ids), true)); } @@ -109,7 +109,7 @@ public class XgDormBedController extends BaseController { */ // @SaCheckPermission("dormbed:dormBed:query") @GetMapping("/details/room/{roomId}") - public R> getBedDetailsByRoomId(@NotNull(message = "房间ID不能为空") @PathVariable Long roomId) { + public R> getBedDetailsByRoomId(@NotNull(message = "房间ID不能为空") @PathVariable("roomId") Long roomId) { List list = xgDormBedService.queryBedDetailsByRoomId(roomId); return R.ok(list); } @@ -122,7 +122,7 @@ public class XgDormBedController extends BaseController { // @SaCheckPermission("dormbed:dormBed:query") @GetMapping("/details/college/room/{roomId}") public R> getBedDetailsByRoomIdForCurrentUserCollege( - @NotNull(message = "房间ID不能为空") @PathVariable Long roomId) { + @NotNull(message = "房间ID不能为空") @PathVariable("roomId") Long roomId) { List list = xgDormBedService.queryBedDetailsByRoomIdForCurrentUserCollege(roomId); return R.ok(list); } @@ -135,7 +135,7 @@ public class XgDormBedController extends BaseController { // @SaCheckPermission("dormbed:dormBed:query") @GetMapping("/details/building/{buildingId}") public R> getBedDetailsByBuildingId( - @NotNull(message = "宿舍楼ID不能为空") @PathVariable Long buildingId) { + @NotNull(message = "宿舍楼ID不能为空") @PathVariable("buildingId") Long buildingId) { List list = xgDormBedService.queryBedDetailsByBuildingId(buildingId); return R.ok(list); } @@ -149,8 +149,8 @@ public class XgDormBedController extends BaseController { // @SaCheckPermission("dormbed:dormBed:query") @GetMapping("/details/room/{roomId}/class/{classId}") public R> getBedDetailsByRoomIdAndClassId( - @NotNull(message = "房间ID不能为空") @PathVariable Long roomId, - @NotNull(message = "班级ID不能为空") @PathVariable Long classId) { + @NotNull(message = "房间ID不能为空") @PathVariable("roomId") Long roomId, + @NotNull(message = "班级ID不能为空") @PathVariable("classId") Long classId) { List list = xgDormBedService.queryBedDetailsByRoomIdAndClassId(roomId, classId); return R.ok(list); } diff --git a/backend/ruoyi-modules/ruoyi-xg/src/main/java/org/dromara/xg/controller/XgDormBedStudentController.java b/backend/ruoyi-modules/ruoyi-xg/src/main/java/org/dromara/xg/controller/XgDormBedStudentController.java index 88e3ed88..58a24fdb 100644 --- a/backend/ruoyi-modules/ruoyi-xg/src/main/java/org/dromara/xg/controller/XgDormBedStudentController.java +++ b/backend/ruoyi-modules/ruoyi-xg/src/main/java/org/dromara/xg/controller/XgDormBedStudentController.java @@ -68,7 +68,7 @@ public class XgDormBedStudentController extends BaseController { */ // @SaCheckPermission("dormBedStudent:dormBedStudent:query") @GetMapping("/{id}") - public R getInfo(@NotNull(message = "主键不能为空") @PathVariable Long id) { + public R getInfo(@NotNull(message = "主键不能为空") @PathVariable("id") Long id) { return R.ok(xgDormBedStudentService.queryById(id)); } @@ -102,7 +102,7 @@ public class XgDormBedStudentController extends BaseController { // @SaCheckPermission("dormBedStudent:dormBedStudent:remove") @Log(title = "床位学生分配关系", businessType = BusinessType.DELETE) @DeleteMapping("/{ids}") - public R remove(@NotEmpty(message = "主键不能为空") @PathVariable Long[] ids) { + public R remove(@NotEmpty(message = "主键不能为空") @PathVariable("ids") Long[] ids) { return toAjax(xgDormBedStudentService.deleteWithValidByIds(List.of(ids), true)); } @@ -172,7 +172,7 @@ public class XgDormBedStudentController extends BaseController { */ // @SaCheckPermission("dormBedStudent:dormBedStudent:list") @GetMapping("/getClassTeacherDormTree") - public R> getClassTeacherDormTree(@RequestParam(required = false) Long classId) { + public R> getClassTeacherDormTree(@RequestParam(value = "classId", required = false) Long classId) { List treeData = xgDormBedStudentService.getClassTeacherDormTree(classId); return R.ok(treeData); } @@ -182,8 +182,8 @@ public class XgDormBedStudentController extends BaseController { */ // @SaCheckPermission("dormBedStudent:dormBedStudent:list") @GetMapping("/getClassTeacherBedDetails") - public R> getClassTeacherBedDetails(@RequestParam(required = false) Long buildingId, - @RequestParam(required = false) Long classId) { + public R> getClassTeacherBedDetails(@RequestParam(value = "buildingId", required = false) Long buildingId, + @RequestParam(value = "classId", required = false) Long classId) { List bedDetails = xgDormBedStudentService.getClassTeacherBedDetails(buildingId, classId); return R.ok(bedDetails); } @@ -193,7 +193,7 @@ public class XgDormBedStudentController extends BaseController { */ // @SaCheckPermission("dormBedStudent:dormBedStudent:list") @GetMapping("/getClassTeacherUnallocatedStudents") - public R> getClassTeacherUnallocatedStudents(@RequestParam(required = false) Long classId) { + public R> getClassTeacherUnallocatedStudents(@RequestParam(value = "classId", required = false) Long classId) { List students = xgDormBedStudentService.getClassTeacherUnallocatedStudents(classId); return R.ok(students); } @@ -205,8 +205,8 @@ public class XgDormBedStudentController extends BaseController { @Log(title = "班主任随机分配床位", businessType = BusinessType.INSERT) @RepeatSubmit() @PostMapping("/classTeacherRandomAllocation") - public R classTeacherRandomAllocation(@RequestParam(required = false) Long buildingId, - @RequestParam(required = false) Long classId) { + public R classTeacherRandomAllocation(@RequestParam(value = "buildingId", required = false) Long buildingId, + @RequestParam(value = "classId", required = false) Long classId) { return toAjax(xgDormBedStudentService.classTeacherRandomAllocation(buildingId, classId)); } @@ -217,8 +217,8 @@ public class XgDormBedStudentController extends BaseController { @Log(title = "班主任按学号分配床位", businessType = BusinessType.INSERT) @RepeatSubmit() @PostMapping("/classTeacherStudentNoAllocation") - public R classTeacherStudentNoAllocation(@RequestParam(required = false) Long buildingId, - @RequestParam(required = false) Long classId) { + public R classTeacherStudentNoAllocation(@RequestParam(value = "buildingId", required = false) Long buildingId, + @RequestParam(value = "classId", required = false) Long classId) { return toAjax(xgDormBedStudentService.classTeacherStudentNoAllocation(buildingId, classId)); } @@ -230,7 +230,7 @@ public class XgDormBedStudentController extends BaseController { @RepeatSubmit() @PostMapping("/classTeacherSelectiveAllocation") public R classTeacherSelectiveAllocation(@Validated @RequestBody XgDormSelectiveAllocationBo allocationParams, - @RequestParam(required = false) Long classId) { + @RequestParam(value = "classId", required = false) Long classId) { return toAjax(xgDormBedStudentService.classTeacherSelectiveAllocation(allocationParams, classId)); } @@ -241,8 +241,8 @@ public class XgDormBedStudentController extends BaseController { @Log(title = "班主任收回床位", businessType = BusinessType.UPDATE) @RepeatSubmit() @PostMapping("/classTeacherRecallBeds") - public R classTeacherRecallBeds(@RequestParam(required = false) Long buildingId, - @RequestParam(required = false) Long classId) { + public R classTeacherRecallBeds(@RequestParam(value = "buildingId", required = false) Long buildingId, + @RequestParam(value = "classId", required = false) Long classId) { return toAjax(xgDormBedStudentService.classTeacherRecallBeds(buildingId, classId)); } @@ -254,7 +254,7 @@ public class XgDormBedStudentController extends BaseController { @RepeatSubmit() @PostMapping("/classTeacherRecallSelectedBeds") public R classTeacherRecallSelectedBeds(@RequestBody List bedIds, - @RequestParam(required = false) Long classId) { + @RequestParam(value = "classId", required = false) Long classId) { return toAjax(xgDormBedStudentService.classTeacherRecallSelectedBeds(bedIds, classId)); } @@ -266,7 +266,7 @@ public class XgDormBedStudentController extends BaseController { @RepeatSubmit() @PostMapping("/classTeacherStayawaySelectedBeds") public R classTeacherStayawaySelectedBeds(@RequestBody List bedIds, - @RequestParam(required = false) Long classId) { + @RequestParam(value = "classId", required = false) Long classId) { return toAjax(xgDormBedStudentService.classTeacherStayawaySelectedBeds(bedIds, classId)); } @@ -278,9 +278,9 @@ public class XgDormBedStudentController extends BaseController { @Log(title = "班主任床位互换", businessType = BusinessType.UPDATE) @RepeatSubmit() @PostMapping("/classTeacherExchangeBeds") - public R classTeacherExchangeBeds(@RequestParam Long sourceStudentId, - @RequestParam Long targetStudentId, - @RequestParam(required = false) Long classId) { + public R classTeacherExchangeBeds(@RequestParam("sourceStudentId") Long sourceStudentId, + @RequestParam("targetStudentId") Long targetStudentId, + @RequestParam(value = "classId", required = false) Long classId) { return toAjax(xgDormBedStudentService.classTeacherExchangeBeds(sourceStudentId, targetStudentId, classId)); } @@ -292,9 +292,9 @@ public class XgDormBedStudentController extends BaseController { @Log(title = "班主任床位移动", businessType = BusinessType.UPDATE) @RepeatSubmit() @PostMapping("/classTeacherMoveBed") - public R classTeacherMoveBed(@RequestParam Long sourceStudentId, - @RequestParam Long targetBedId, - @RequestParam(required = false) Long classId) { + public R classTeacherMoveBed(@RequestParam("sourceStudentId") Long sourceStudentId, + @RequestParam("targetBedId") Long targetBedId, + @RequestParam(value = "classId", required = false) Long classId) { return toAjax(xgDormBedStudentService.classTeacherMoveBed(sourceStudentId, targetBedId, classId)); } @@ -305,7 +305,7 @@ public class XgDormBedStudentController extends BaseController { */ // @SaCheckPermission("dormBedStudent:dormBedStudent:list") @GetMapping("/getClassOccupiedBedDetails") - public R> getClassOccupiedBedDetails(@RequestParam(required = false) Long classId) { + public R> getClassOccupiedBedDetails(@RequestParam(value = "classId", required = false) Long classId) { List occupiedBedDetails = xgDormBedStudentService.getClassOccupiedBedDetails(classId); return R.ok(occupiedBedDetails); } @@ -316,7 +316,7 @@ public class XgDormBedStudentController extends BaseController { */ // @SaCheckPermission("dormBedStudent:dormBedStudent:list") @GetMapping("/getClassUnoccupiedBedDetails") - public R> getClassUnoccupiedBedDetails(@RequestParam(required = false) Long classId) { + public R> getClassUnoccupiedBedDetails(@RequestParam(value = "classId", required = false) Long classId) { List unoccupiedBedDetails = xgDormBedStudentService.getClassUnoccupiedBedDetails(classId); return R.ok(unoccupiedBedDetails); } @@ -327,7 +327,7 @@ public class XgDormBedStudentController extends BaseController { */ // @SaCheckPermission("dormBedStudent:dormBedStudent:list") @GetMapping("/getRoomStudents") - public R> getRoomStudents(@RequestParam Long roomId) { + public R> getRoomStudents(@RequestParam("roomId") Long roomId) { List roomStudents = xgDormBedStudentService.getRoomStudents(roomId); return R.ok(roomStudents); } @@ -338,7 +338,7 @@ public class XgDormBedStudentController extends BaseController { */ // @SaCheckPermission("dormBedStudent:dormBedStudent:list") @GetMapping("/currentDormInfo/{studentId}") - public R getCurrentDormInfo(@NotNull(message = "学生ID不能为空") @PathVariable Long studentId) { + public R getCurrentDormInfo(@NotNull(message = "学生ID不能为空") @PathVariable("studentId") Long studentId) { Object currentDormInfo = xgDormBedStudentService.getCurrentDormInfo(studentId); return R.ok(currentDormInfo); } @@ -349,7 +349,7 @@ public class XgDormBedStudentController extends BaseController { */ // @SaCheckPermission("dormBedStudent:dormBedStudent:list") @GetMapping("/bedStudentInfo/{bedId}") - public R getBedStudentInfo(@NotNull(message = "床位ID不能为空") @PathVariable Long bedId) { + public R getBedStudentInfo(@NotNull(message = "床位ID不能为空") @PathVariable("bedId") Long bedId) { Object bedStudentInfo = xgDormBedStudentService.getBedStudentInfo(bedId); return R.ok(bedStudentInfo); } diff --git a/backend/ruoyi-modules/ruoyi-xg/src/main/java/org/dromara/xg/controller/XgDormBuildingController.java b/backend/ruoyi-modules/ruoyi-xg/src/main/java/org/dromara/xg/controller/XgDormBuildingController.java index 760ea131..d921cd27 100644 --- a/backend/ruoyi-modules/ruoyi-xg/src/main/java/org/dromara/xg/controller/XgDormBuildingController.java +++ b/backend/ruoyi-modules/ruoyi-xg/src/main/java/org/dromara/xg/controller/XgDormBuildingController.java @@ -65,7 +65,7 @@ public class XgDormBuildingController extends BaseController { */ // @SaCheckPermission("sslxx:dormBuilding:query") @GetMapping("/{id}") - public R getInfo(@NotNull(message = "主键不能为空") @PathVariable Long id) { + public R getInfo(@NotNull(message = "主键不能为空") @PathVariable("id") Long id) { return R.ok(xgDormBuildingService.queryById(id)); } @@ -99,7 +99,7 @@ public class XgDormBuildingController extends BaseController { // @SaCheckPermission("sslxx:dormBuilding:remove") @Log(title = "宿舍楼信息", businessType = BusinessType.DELETE) @DeleteMapping("/{ids}") - public R remove(@NotEmpty(message = "主键不能为空") @PathVariable Long[] ids) { + public R remove(@NotEmpty(message = "主键不能为空") @PathVariable("ids") Long[] ids) { return toAjax(xgDormBuildingService.deleteWithValidByIds(List.of(ids), true)); } diff --git a/backend/ruoyi-modules/ruoyi-xg/src/main/java/org/dromara/xg/controller/XgDormCampusController.java b/backend/ruoyi-modules/ruoyi-xg/src/main/java/org/dromara/xg/controller/XgDormCampusController.java index 49f88c2f..a79b6ec9 100644 --- a/backend/ruoyi-modules/ruoyi-xg/src/main/java/org/dromara/xg/controller/XgDormCampusController.java +++ b/backend/ruoyi-modules/ruoyi-xg/src/main/java/org/dromara/xg/controller/XgDormCampusController.java @@ -64,7 +64,7 @@ public class XgDormCampusController extends BaseController { // @SaCheckPermission("xqxx:dormCampus:query") @GetMapping("/{id}") public R getInfo(@NotNull(message = "主键不能为空") - @PathVariable Long id) { + @PathVariable("id") Long id) { return R.ok(xgDormCampusService.queryById(id)); } @@ -99,7 +99,7 @@ public class XgDormCampusController extends BaseController { @Log(title = "校区信息", businessType = BusinessType.DELETE) @DeleteMapping("/{ids}") public R remove(@NotEmpty(message = "主键不能为空") - @PathVariable Long[] ids) { + @PathVariable("ids") Long[] ids) { return toAjax(xgDormCampusService.deleteWithValidByIds(List.of(ids), true)); } } diff --git a/backend/ruoyi-modules/ruoyi-xg/src/main/java/org/dromara/xg/controller/XgDormHygieneCheckController.java b/backend/ruoyi-modules/ruoyi-xg/src/main/java/org/dromara/xg/controller/XgDormHygieneCheckController.java index cbf15987..dda765db 100644 --- a/backend/ruoyi-modules/ruoyi-xg/src/main/java/org/dromara/xg/controller/XgDormHygieneCheckController.java +++ b/backend/ruoyi-modules/ruoyi-xg/src/main/java/org/dromara/xg/controller/XgDormHygieneCheckController.java @@ -66,7 +66,7 @@ public class XgDormHygieneCheckController extends BaseController { */ // @SaCheckPermission("dormHygieneCheck:dormHygieneCheck:query") @GetMapping("/{id}") - public R getInfo(@NotNull(message = "主键不能为空") @PathVariable Long id) { + public R getInfo(@NotNull(message = "主键不能为空") @PathVariable("id") Long id) { return R.ok(xgDormHygieneCheckService.queryById(id)); } @@ -122,7 +122,7 @@ public class XgDormHygieneCheckController extends BaseController { // @SaCheckPermission("dormHygieneCheck:dormHygieneCheck:remove") @Log(title = "宿舍卫生检查", businessType = BusinessType.DELETE) @DeleteMapping("/{ids}") - public R remove(@NotEmpty(message = "主键不能为空") @PathVariable Long[] ids) { + public R remove(@NotEmpty(message = "主键不能为空") @PathVariable("ids") Long[] ids) { return toAjax(xgDormHygieneCheckService.deleteWithValidByIds(List.of(ids), true)); } @@ -145,7 +145,7 @@ public class XgDormHygieneCheckController extends BaseController { // @SaCheckPermission("dormHygieneCheck:dormHygieneCheck:query") @GetMapping("/student/{studentId}") public R> getHygieneChecksByStudentId( - @NotNull(message = "学生ID不能为空") @PathVariable Long studentId) { + @NotNull(message = "学生ID不能为空") @PathVariable("studentId") Long studentId) { List list = xgDormHygieneCheckService.queryByStudentId(studentId); return R.ok(list); } @@ -160,7 +160,7 @@ public class XgDormHygieneCheckController extends BaseController { // @SaCheckPermission("dormHygieneCheck:dormHygieneCheck:query") @GetMapping("/student/{studentId}/page") public TableDataInfo getHygieneChecksByStudentIdPage( - @NotNull(message = "学生ID不能为空") @PathVariable Long studentId, + @NotNull(message = "学生ID不能为空") @PathVariable("studentId") Long studentId, XgDormHygieneCheckBo bo, PageQuery pageQuery) { return xgDormHygieneCheckService.queryPageListByStudentId(studentId, bo, pageQuery); } @@ -201,7 +201,7 @@ public class XgDormHygieneCheckController extends BaseController { // @SaCheckPermission("dormHygieneCheck:dormHygieneCheck:query") @GetMapping("/getViolations/{hygieneCheckId}") public R> getViolations( - @NotNull(message = "卫生检查ID不能为空") @PathVariable Long hygieneCheckId) { + @NotNull(message = "卫生检查ID不能为空") @PathVariable("hygieneCheckId") Long hygieneCheckId) { List violations = xgDormHygieneCheckService .getViolationsByHygieneCheckId(hygieneCheckId); return R.ok(violations); diff --git a/backend/ruoyi-modules/ruoyi-xg/src/main/java/org/dromara/xg/controller/XgDormHygieneStudentScoreController.java b/backend/ruoyi-modules/ruoyi-xg/src/main/java/org/dromara/xg/controller/XgDormHygieneStudentScoreController.java index a7c668b8..ab7e0cf3 100644 --- a/backend/ruoyi-modules/ruoyi-xg/src/main/java/org/dromara/xg/controller/XgDormHygieneStudentScoreController.java +++ b/backend/ruoyi-modules/ruoyi-xg/src/main/java/org/dromara/xg/controller/XgDormHygieneStudentScoreController.java @@ -63,7 +63,7 @@ public class XgDormHygieneStudentScoreController extends BaseController { */ // @SaCheckPermission("dormHygieneStudentScore:dormHygieneStudentScore:query") @GetMapping("/{id}") - public R getInfo(@NotNull(message = "主键不能为空") @PathVariable Long id) { + public R getInfo(@NotNull(message = "主键不能为空") @PathVariable("id") Long id) { return R.ok(xgDormHygieneStudentScoreService.queryById(id)); } @@ -97,7 +97,7 @@ public class XgDormHygieneStudentScoreController extends BaseController { // @SaCheckPermission("dormHygieneStudentScore:dormHygieneStudentScore:remove") @Log(title = "宿舍卫生检查学生评分", businessType = BusinessType.DELETE) @DeleteMapping("/{ids}") - public R remove(@NotEmpty(message = "主键不能为空") @PathVariable Long[] ids) { + public R remove(@NotEmpty(message = "主键不能为空") @PathVariable("ids") Long[] ids) { return toAjax(xgDormHygieneStudentScoreService.deleteWithValidByIds(List.of(ids), true)); } @@ -109,7 +109,7 @@ public class XgDormHygieneStudentScoreController extends BaseController { // @SaCheckPermission("dormHygieneStudentScore:dormHygieneStudentScore:query") @GetMapping("/getByCheckId/{hygieneCheckId}") public R> getByCheckId( - @NotNull(message = "卫生检查ID不能为空") @PathVariable Long hygieneCheckId) { + @NotNull(message = "卫生检查ID不能为空") @PathVariable("hygieneCheckId") Long hygieneCheckId) { return R.ok(xgDormHygieneStudentScoreService.queryByHygieneCheckId(hygieneCheckId)); } @@ -121,7 +121,7 @@ public class XgDormHygieneStudentScoreController extends BaseController { // @SaCheckPermission("dormHygieneStudentScore:dormHygieneStudentScore:remove") @Log(title = "批量删除学生评分", businessType = BusinessType.DELETE) @DeleteMapping("/deleteByCheckId/{hygieneCheckId}") - public R deleteByCheckId(@NotNull(message = "卫生检查ID不能为空") @PathVariable Long hygieneCheckId) { + public R deleteByCheckId(@NotNull(message = "卫生检查ID不能为空") @PathVariable("hygieneCheckId") Long hygieneCheckId) { return toAjax(xgDormHygieneStudentScoreService.deleteByHygieneCheckId(hygieneCheckId)); } } diff --git a/backend/ruoyi-modules/ruoyi-xg/src/main/java/org/dromara/xg/controller/XgDormManagerBuildingController.java b/backend/ruoyi-modules/ruoyi-xg/src/main/java/org/dromara/xg/controller/XgDormManagerBuildingController.java index 8efd2e66..a694def8 100644 --- a/backend/ruoyi-modules/ruoyi-xg/src/main/java/org/dromara/xg/controller/XgDormManagerBuildingController.java +++ b/backend/ruoyi-modules/ruoyi-xg/src/main/java/org/dromara/xg/controller/XgDormManagerBuildingController.java @@ -64,7 +64,7 @@ public class XgDormManagerBuildingController extends BaseController { // @SaCheckPermission("glysslqxgx:dormManagerBuilding:query") @GetMapping("/{id}") public R getInfo(@NotNull(message = "主键不能为空") - @PathVariable Long id) { + @PathVariable("id") Long id) { return R.ok(xgDormManagerBuildingService.queryById(id)); } @@ -99,7 +99,7 @@ public class XgDormManagerBuildingController extends BaseController { @Log(title = "管理员宿舍楼权限关系", businessType = BusinessType.DELETE) @DeleteMapping("/{ids}") public R remove(@NotEmpty(message = "主键不能为空") - @PathVariable Long[] ids) { + @PathVariable("ids") Long[] ids) { return toAjax(xgDormManagerBuildingService.deleteWithValidByIds(List.of(ids), true)); } } diff --git a/backend/ruoyi-modules/ruoyi-xg/src/main/java/org/dromara/xg/controller/XgDormManagerController.java b/backend/ruoyi-modules/ruoyi-xg/src/main/java/org/dromara/xg/controller/XgDormManagerController.java index 148da0a9..d1e296d0 100644 --- a/backend/ruoyi-modules/ruoyi-xg/src/main/java/org/dromara/xg/controller/XgDormManagerController.java +++ b/backend/ruoyi-modules/ruoyi-xg/src/main/java/org/dromara/xg/controller/XgDormManagerController.java @@ -64,7 +64,7 @@ public class XgDormManagerController extends BaseController { */ // @SaCheckPermission("ssglyxx:dormManager:query") @GetMapping("/{id}") - public R getInfo(@NotNull(message = "主键不能为空") @PathVariable Long id) { + public R getInfo(@NotNull(message = "主键不能为空") @PathVariable("id") Long id) { return R.ok(xgDormManagerService.queryById(id)); } @@ -76,8 +76,8 @@ public class XgDormManagerController extends BaseController { */ // @SaCheckPermission("ssglyxx:dormManager:list") @GetMapping("/teachers") - public R>> listTeachers(@RequestParam(required = false) String name, - @RequestParam(required = false) String managerType) { + public R>> listTeachers(@RequestParam(value = "name", required = false) String name, + @RequestParam(value = "managerType", required = false) String managerType) { return R.ok(xgDormManagerService.queryTeacherList(name, managerType)); } @@ -111,7 +111,7 @@ public class XgDormManagerController extends BaseController { // @SaCheckPermission("ssglyxx:dormManager:remove") @Log(title = "宿舍管理员信息", businessType = BusinessType.DELETE) @DeleteMapping("/{ids}") - public R remove(@NotEmpty(message = "主键不能为空") @PathVariable Long[] ids) { + public R remove(@NotEmpty(message = "主键不能为空") @PathVariable("ids") Long[] ids) { return toAjax(xgDormManagerService.deleteWithValidByIds(List.of(ids), true)); } } diff --git a/backend/ruoyi-modules/ruoyi-xg/src/main/java/org/dromara/xg/controller/XgDormManagerSourceController.java b/backend/ruoyi-modules/ruoyi-xg/src/main/java/org/dromara/xg/controller/XgDormManagerSourceController.java index fc74d1c0..62ebf6d3 100644 --- a/backend/ruoyi-modules/ruoyi-xg/src/main/java/org/dromara/xg/controller/XgDormManagerSourceController.java +++ b/backend/ruoyi-modules/ruoyi-xg/src/main/java/org/dromara/xg/controller/XgDormManagerSourceController.java @@ -63,7 +63,7 @@ public class XgDormManagerSourceController extends BaseController { */ // @SaCheckPermission("glysqgx:dormManagerSource:query") @GetMapping("/{id}") - public R getInfo(@NotNull(message = "主键不能为空") @PathVariable Long id) { + public R getInfo(@NotNull(message = "主键不能为空") @PathVariable("id") Long id) { return R.ok(xgDormManagerSourceService.queryById(id)); } @@ -97,7 +97,7 @@ public class XgDormManagerSourceController extends BaseController { // @SaCheckPermission("glysqgx:dormManagerSource:remove") @Log(title = "管理员授权关系", businessType = BusinessType.DELETE) @DeleteMapping("/{ids}") - public R remove(@NotEmpty(message = "主键不能为空") @PathVariable Long[] ids) { + public R remove(@NotEmpty(message = "主键不能为空") @PathVariable("ids") Long[] ids) { return toAjax(xgDormManagerSourceService.deleteWithValidByIds(List.of(ids), true)); } diff --git a/backend/ruoyi-modules/ruoyi-xg/src/main/java/org/dromara/xg/controller/XgDormRollCallController.java b/backend/ruoyi-modules/ruoyi-xg/src/main/java/org/dromara/xg/controller/XgDormRollCallController.java index 429f7e22..c70aeba3 100644 --- a/backend/ruoyi-modules/ruoyi-xg/src/main/java/org/dromara/xg/controller/XgDormRollCallController.java +++ b/backend/ruoyi-modules/ruoyi-xg/src/main/java/org/dromara/xg/controller/XgDormRollCallController.java @@ -36,7 +36,7 @@ public class XgDormRollCallController extends BaseController { } @GetMapping("/{id}") - public R getInfo(@NotNull(message = "主键不能为空") @PathVariable Long id) { + public R getInfo(@NotNull(message = "主键不能为空") @PathVariable("id") Long id) { return R.ok(xgDormRollCallService.queryById(id)); } @@ -53,7 +53,7 @@ public class XgDormRollCallController extends BaseController { } @DeleteMapping("/{ids}") - public R remove(@NotEmpty(message = "主键不能为空") @PathVariable Long[] ids) { + public R remove(@NotEmpty(message = "主键不能为空") @PathVariable("ids") Long[] ids) { return toAjax(xgDormRollCallService.deleteWithValidByIds(List.of(ids), true)); } @@ -71,8 +71,8 @@ public class XgDormRollCallController extends BaseController { @GetMapping("/buildingRoomsStatus") public R> getBuildingRoomsStatus( - @RequestParam Long buildingId, - @RequestParam(required = false) String batchNo) { + @RequestParam("buildingId") Long buildingId, + @RequestParam(value = "batchNo", required = false) String batchNo) { return R.ok(xgDormRollCallService.getBuildingRoomsStatus(buildingId, batchNo)); } @@ -88,7 +88,7 @@ public class XgDormRollCallController extends BaseController { @GetMapping("/roomHistory/{roomId}") public TableDataInfo roomHistory( - @NotNull(message = "房间ID不能为空") @PathVariable Long roomId, + @NotNull(message = "房间ID不能为空") @PathVariable("roomId") Long roomId, PageQuery pageQuery) { return xgDormRollCallService.queryRoomHistory(roomId, pageQuery); } diff --git a/backend/ruoyi-modules/ruoyi-xg/src/main/java/org/dromara/xg/controller/XgDormRoomController.java b/backend/ruoyi-modules/ruoyi-xg/src/main/java/org/dromara/xg/controller/XgDormRoomController.java index 51edc07a..ebb0f26c 100644 --- a/backend/ruoyi-modules/ruoyi-xg/src/main/java/org/dromara/xg/controller/XgDormRoomController.java +++ b/backend/ruoyi-modules/ruoyi-xg/src/main/java/org/dromara/xg/controller/XgDormRoomController.java @@ -62,7 +62,7 @@ public class XgDormRoomController extends BaseController { // @SaCheckPermission("xgss:dormRoom:list") @GetMapping("/class/{classId}/list") public TableDataInfo classRoomList( - @NotNull(message = "班级ID不能为空") @PathVariable Long classId, + @NotNull(message = "班级ID不能为空") @PathVariable("classId") Long classId, XgDormRoomBo bo, PageQuery pageQuery) { return xgDormRoomService.queryPageListByClassId(bo, pageQuery, classId); @@ -86,10 +86,10 @@ public class XgDormRoomController extends BaseController { @Log(title = "住宿清单", businessType = BusinessType.EXPORT) @PostMapping("/exportAccommodationList") public void exportAccommodationList( - @RequestParam(required = false) Long buildingId, - @RequestParam(required = false) String buildingName, - @RequestParam(required = false) String buildingType, - @RequestParam(required = false) String accommodationData, + @RequestParam(value = "buildingId", required = false) Long buildingId, + @RequestParam(value = "buildingName", required = false) String buildingName, + @RequestParam(value = "buildingType", required = false) String buildingType, + @RequestParam(value = "accommodationData", required = false) String accommodationData, HttpServletResponse response) { // 构建参数Map @@ -113,7 +113,7 @@ public class XgDormRoomController extends BaseController { */ // @SaCheckPermission("xgss:dormRoom:query") @GetMapping("/{id}") - public R getInfo(@NotNull(message = "主键不能为空") @PathVariable Long id) { + public R getInfo(@NotNull(message = "主键不能为空") @PathVariable("id") Long id) { return R.ok(xgDormRoomService.queryById(id)); } @@ -147,7 +147,7 @@ public class XgDormRoomController extends BaseController { // @SaCheckPermission("xgss:dormRoom:remove") @Log(title = "宿舍房间信息", businessType = BusinessType.DELETE) @DeleteMapping("/{ids}") - public R remove(@NotEmpty(message = "主键不能为空") @PathVariable Long[] ids) { + public R remove(@NotEmpty(message = "主键不能为空") @PathVariable("ids") Long[] ids) { return toAjax(xgDormRoomService.deleteWithValidByIds(List.of(ids), true)); } } diff --git a/backend/ruoyi-modules/ruoyi-xg/src/main/java/org/dromara/xg/controller/XgDormViolationController.java b/backend/ruoyi-modules/ruoyi-xg/src/main/java/org/dromara/xg/controller/XgDormViolationController.java index 67b693a8..b4d452e7 100644 --- a/backend/ruoyi-modules/ruoyi-xg/src/main/java/org/dromara/xg/controller/XgDormViolationController.java +++ b/backend/ruoyi-modules/ruoyi-xg/src/main/java/org/dromara/xg/controller/XgDormViolationController.java @@ -79,7 +79,7 @@ public class XgDormViolationController extends BaseController { */ // @SaCheckPermission("dormViolation:dormViolation:query") @GetMapping("/{id}") - public R getInfo(@NotNull(message = "主键不能为空") @PathVariable Long id) { + public R getInfo(@NotNull(message = "主键不能为空") @PathVariable("id") Long id) { return R.ok(xgDormViolationService.queryById(id)); } @@ -113,7 +113,7 @@ public class XgDormViolationController extends BaseController { // @SaCheckPermission("dormViolation:dormViolation:remove") @Log(title = "宿舍违纪记录", businessType = BusinessType.DELETE) @DeleteMapping("/{ids}") - public R remove(@NotEmpty(message = "主键不能为空") @PathVariable Long[] ids) { + public R remove(@NotEmpty(message = "主键不能为空") @PathVariable("ids") Long[] ids) { return toAjax(xgDormViolationService.deleteWithValidByIds(List.of(ids), true)); } @@ -133,7 +133,7 @@ public class XgDormViolationController extends BaseController { */ // @SaCheckPermission("dormViolation:dormViolation:list") @GetMapping("/student/{studentId}") - public R getStudentById(@NotNull(message = "学生ID不能为空") @PathVariable Long studentId) { + public R getStudentById(@NotNull(message = "学生ID不能为空") @PathVariable("studentId") Long studentId) { return R.ok(xgDormViolationService.getStudentById(studentId)); } diff --git a/backend/ruoyi-modules/ruoyi-xg/src/main/java/org/dromara/xg/controller/XgHolidayStayController.java b/backend/ruoyi-modules/ruoyi-xg/src/main/java/org/dromara/xg/controller/XgHolidayStayController.java index 942fc59d..ef1b3666 100644 --- a/backend/ruoyi-modules/ruoyi-xg/src/main/java/org/dromara/xg/controller/XgHolidayStayController.java +++ b/backend/ruoyi-modules/ruoyi-xg/src/main/java/org/dromara/xg/controller/XgHolidayStayController.java @@ -65,7 +65,7 @@ public class XgHolidayStayController extends BaseController { */ // @SaCheckPermission("holidayStay:holidayStay:query") @GetMapping("/{id}") - public R getInfo(@NotNull(message = "主键不能为空") @PathVariable Long id) { + public R getInfo(@NotNull(message = "主键不能为空") @PathVariable("id") Long id) { return R.ok(xgHolidayStayService.queryById(id)); } @@ -99,7 +99,7 @@ public class XgHolidayStayController extends BaseController { // @SaCheckPermission("holidayStay:holidayStay:remove") @Log(title = "假期留宿管理", businessType = BusinessType.DELETE) @DeleteMapping("/{ids}") - public R remove(@NotEmpty(message = "主键不能为空") @PathVariable Long[] ids) { + public R remove(@NotEmpty(message = "主键不能为空") @PathVariable("ids") Long[] ids) { return toAjax(xgHolidayStayService.deleteWithValidByIds(List.of(ids), true)); } diff --git a/backend/ruoyi-modules/ruoyi-xg/src/main/java/org/dromara/xg/controller/XgLeaveTypeConfigController.java b/backend/ruoyi-modules/ruoyi-xg/src/main/java/org/dromara/xg/controller/XgLeaveTypeConfigController.java index b0a68155..26e5d284 100644 --- a/backend/ruoyi-modules/ruoyi-xg/src/main/java/org/dromara/xg/controller/XgLeaveTypeConfigController.java +++ b/backend/ruoyi-modules/ruoyi-xg/src/main/java/org/dromara/xg/controller/XgLeaveTypeConfigController.java @@ -64,7 +64,7 @@ public class XgLeaveTypeConfigController extends BaseController { // @SaCheckPermission("xgLeaveTypeConfig:xgLeaveTypeConfig:query") @GetMapping("/{id}") public R getInfo(@NotNull(message = "主键不能为空") - @PathVariable Long id) { + @PathVariable("id") Long id) { return R.ok(xgLeaveTypeConfigService.queryById(id)); } @@ -99,7 +99,7 @@ public class XgLeaveTypeConfigController extends BaseController { @Log(title = "学生请假类型配置", businessType = BusinessType.DELETE) @DeleteMapping("/{ids}") public R remove(@NotEmpty(message = "主键不能为空") - @PathVariable Long[] ids) { + @PathVariable("ids") Long[] ids) { return toAjax(xgLeaveTypeConfigService.deleteWithValidByIds(List.of(ids), true)); } } diff --git a/backend/ruoyi-modules/ruoyi-xg/src/main/java/org/dromara/xg/controller/XgStuColBatchClassController.java b/backend/ruoyi-modules/ruoyi-xg/src/main/java/org/dromara/xg/controller/XgStuColBatchClassController.java index 003b419e..90638de6 100644 --- a/backend/ruoyi-modules/ruoyi-xg/src/main/java/org/dromara/xg/controller/XgStuColBatchClassController.java +++ b/backend/ruoyi-modules/ruoyi-xg/src/main/java/org/dromara/xg/controller/XgStuColBatchClassController.java @@ -76,7 +76,7 @@ public class XgStuColBatchClassController extends BaseController { */ // @SaCheckPermission("stuColBatchClass:stuColBatchClass:query") @GetMapping("/{id}") - public R getInfo(@NotNull(message = "主键不能为空") @PathVariable Long id) { + public R getInfo(@NotNull(message = "主键不能为空") @PathVariable("id") Long id) { return R.ok(xgStuColBatchClassService.queryById(id)); } @@ -110,7 +110,7 @@ public class XgStuColBatchClassController extends BaseController { // @SaCheckPermission("stuColBatchClass:stuColBatchClass:remove") @Log(title = "学生信息收集批次班级权限", businessType = BusinessType.DELETE) @DeleteMapping("/{ids}") - public R remove(@NotEmpty(message = "主键不能为空") @PathVariable Long[] ids) { + public R remove(@NotEmpty(message = "主键不能为空") @PathVariable("ids") Long[] ids) { return toAjax(xgStuColBatchClassService.deleteWithValidByIds(List.of(ids), true)); } @@ -121,7 +121,7 @@ public class XgStuColBatchClassController extends BaseController { */ // @SaCheckPermission("stuColBatchClass:stuColBatchClass:query") @GetMapping("/getScope/{batchId}") - public R> getScope(@NotNull(message = "批次ID不能为空") @PathVariable Long batchId) { + public R> getScope(@NotNull(message = "批次ID不能为空") @PathVariable("batchId") Long batchId) { try { List classIds = xgStuColBatchClassMapper.selectClassIdsByBatchId(batchId); return R.ok(classIds); @@ -137,7 +137,7 @@ public class XgStuColBatchClassController extends BaseController { */ // @SaCheckPermission("stuColBatchClass:stuColBatchClass:query") @GetMapping("/getScopeDetail/{batchId}") - public R> getScopeDetail(@NotNull(message = "批次ID不能为空") @PathVariable Long batchId) { + public R> getScopeDetail(@NotNull(message = "批次ID不能为空") @PathVariable("batchId") Long batchId) { try { List scopeDetail = xgStuColBatchClassMapper.selectScopeDetailByBatchId(batchId); return R.ok(scopeDetail); @@ -268,7 +268,7 @@ public class XgStuColBatchClassController extends BaseController { // @SaCheckPermission("stuColBatchClass:stuColBatchClass:query") @GetMapping("/getBatchAuthScope/{batchId}") public R> getBatchAuthScope( - @NotNull(message = "批次ID不能为空") @PathVariable Long batchId) { + @NotNull(message = "批次ID不能为空") @PathVariable("batchId") Long batchId) { try { // 第一步:获取当前用户所有的组织权限信息 List userDeptTree = xgStudentManagerSourceService.getCurrentUserAuthDeptTree(); diff --git a/backend/ruoyi-modules/ruoyi-xg/src/main/java/org/dromara/xg/controller/XgStuColBatchController.java b/backend/ruoyi-modules/ruoyi-xg/src/main/java/org/dromara/xg/controller/XgStuColBatchController.java index 376e0d8e..655ad66a 100644 --- a/backend/ruoyi-modules/ruoyi-xg/src/main/java/org/dromara/xg/controller/XgStuColBatchController.java +++ b/backend/ruoyi-modules/ruoyi-xg/src/main/java/org/dromara/xg/controller/XgStuColBatchController.java @@ -64,7 +64,7 @@ public class XgStuColBatchController extends BaseController { // @SaCheckPermission("XgStuColBatch:stuColBatch:query") @GetMapping("/{id}") public R getInfo(@NotNull(message = "主键不能为空") - @PathVariable Long id) { + @PathVariable("id") Long id) { return R.ok(xgStuColBatchService.queryById(id)); } @@ -99,7 +99,7 @@ public class XgStuColBatchController extends BaseController { @Log(title = "学生信息收集批次", businessType = BusinessType.DELETE) @DeleteMapping("/{ids}") public R remove(@NotEmpty(message = "主键不能为空") - @PathVariable Long[] ids) { + @PathVariable("ids") Long[] ids) { return toAjax(xgStuColBatchService.deleteWithValidByIds(List.of(ids), true)); } } diff --git a/backend/ruoyi-modules/ruoyi-xg/src/main/java/org/dromara/xg/controller/XgStudentCancelLeaveController.java b/backend/ruoyi-modules/ruoyi-xg/src/main/java/org/dromara/xg/controller/XgStudentCancelLeaveController.java index 0250876a..4ec32e3b 100644 --- a/backend/ruoyi-modules/ruoyi-xg/src/main/java/org/dromara/xg/controller/XgStudentCancelLeaveController.java +++ b/backend/ruoyi-modules/ruoyi-xg/src/main/java/org/dromara/xg/controller/XgStudentCancelLeaveController.java @@ -63,7 +63,7 @@ public class XgStudentCancelLeaveController extends BaseController { */ // @SaCheckPermission("studentCancelLeave:studentCancelLeave:query") @GetMapping("/{id}") - public R getInfo(@NotNull(message = "主键不能为空") @PathVariable Long id) { + public R getInfo(@NotNull(message = "主键不能为空") @PathVariable("id") Long id) { return R.ok(xgStudentCancelLeaveService.queryById(id)); } @@ -98,7 +98,7 @@ public class XgStudentCancelLeaveController extends BaseController { // @SaCheckPermission("studentCancelLeave:studentCancelLeave:remove") @Log(title = "学生销假", businessType = BusinessType.DELETE) @DeleteMapping("/{ids}") - public R remove(@NotEmpty(message = "主键不能为空") @PathVariable Long[] ids) { + public R remove(@NotEmpty(message = "主键不能为空") @PathVariable("ids") Long[] ids) { return toAjax(xgStudentCancelLeaveService.deleteWithValidByIds(List.of(ids), true)); } @@ -109,7 +109,7 @@ public class XgStudentCancelLeaveController extends BaseController { */ // @SaCheckPermission("studentCancelLeave:studentCancelLeave:query") @GetMapping("/getCancelLeaveId/{leaveId}") - public R getCancelLeaveIdByLeaveId(@NotNull(message = "请假ID不能为空") @PathVariable Long leaveId) { + public R getCancelLeaveIdByLeaveId(@NotNull(message = "请假ID不能为空") @PathVariable("leaveId") Long leaveId) { Long cancelLeaveId = xgStudentCancelLeaveService.getCancelLeaveIdByLeaveId(leaveId); return R.ok(cancelLeaveId); } @@ -121,7 +121,7 @@ public class XgStudentCancelLeaveController extends BaseController { */ // @SaCheckPermission("studentCancelLeave:studentCancelLeave:query") @GetMapping("/getLeaveId/{cancelLeaveId}") - public R getLeaveIdByCancelLeaveId(@NotNull(message = "销假ID不能为空") @PathVariable Long cancelLeaveId) { + public R getLeaveIdByCancelLeaveId(@NotNull(message = "销假ID不能为空") @PathVariable("cancelLeaveId") Long cancelLeaveId) { Long leaveId = xgStudentCancelLeaveService.getLeaveIdByCancelLeaveId(cancelLeaveId); return R.ok(leaveId); } diff --git a/backend/ruoyi-modules/ruoyi-xg/src/main/java/org/dromara/xg/controller/XgStudentClassChangeController.java b/backend/ruoyi-modules/ruoyi-xg/src/main/java/org/dromara/xg/controller/XgStudentClassChangeController.java index 3ff89dc6..9b0cf2d2 100644 --- a/backend/ruoyi-modules/ruoyi-xg/src/main/java/org/dromara/xg/controller/XgStudentClassChangeController.java +++ b/backend/ruoyi-modules/ruoyi-xg/src/main/java/org/dromara/xg/controller/XgStudentClassChangeController.java @@ -63,7 +63,7 @@ public class XgStudentClassChangeController extends BaseController { */ // @SaCheckPermission("studentMsg:studentClassChange:query") @GetMapping("/{id}") - public R getInfo(@NotNull(message = "主键不能为空") @PathVariable Long id) { + public R getInfo(@NotNull(message = "主键不能为空") @PathVariable("id") Long id) { return R.ok(xgStudentClassChangeService.queryById(id)); } @@ -97,7 +97,7 @@ public class XgStudentClassChangeController extends BaseController { // @SaCheckPermission("studentMsg:studentClassChange:remove") @Log(title = "学生换班级", businessType = BusinessType.DELETE) @DeleteMapping("/{ids}") - public R remove(@NotEmpty(message = "主键不能为空") @PathVariable Long[] ids) { + public R remove(@NotEmpty(message = "主键不能为空") @PathVariable("ids") Long[] ids) { return toAjax(xgStudentClassChangeService.deleteWithValidByIds(List.of(ids), true)); } diff --git a/backend/ruoyi-modules/ruoyi-xg/src/main/java/org/dromara/xg/controller/XgStudentController.java b/backend/ruoyi-modules/ruoyi-xg/src/main/java/org/dromara/xg/controller/XgStudentController.java index 150f3d32..e7ff387d 100644 --- a/backend/ruoyi-modules/ruoyi-xg/src/main/java/org/dromara/xg/controller/XgStudentController.java +++ b/backend/ruoyi-modules/ruoyi-xg/src/main/java/org/dromara/xg/controller/XgStudentController.java @@ -52,7 +52,7 @@ public class XgStudentController extends BaseController { */ // @SaCheckPermission("xg:student:list") @GetMapping("/search") - public R> searchByName(@RequestParam String name, + public R> searchByName(@RequestParam("name") String name, @RequestParam(defaultValue = "10") Integer limit) { List list = xgStudentService.searchByName(name, limit); return R.ok(list); @@ -73,7 +73,7 @@ public class XgStudentController extends BaseController { */ // @SaCheckPermission("xg:student:list") @GetMapping("/class/{classId}") - public R> getStudentsByClassId(@PathVariable Long classId) { + public R> getStudentsByClassId(@PathVariable("classId") Long classId) { List list = xgStudentService.getStudentsByClassId(classId); return R.ok(list); } @@ -95,7 +95,7 @@ public class XgStudentController extends BaseController { // @SaCheckPermission("xg:student:query") @GetMapping("/{id}") public R getInfo(@NotNull(message = "主键不能为空") - @PathVariable Long id) { + @PathVariable("id") Long id) { return R.ok(xgStudentService.queryById(id)); } @@ -128,7 +128,7 @@ public class XgStudentController extends BaseController { @Log(title = "学生信息管理", businessType = BusinessType.DELETE) @DeleteMapping("/{ids}") public R remove(@NotEmpty(message = "主键不能为空") - @PathVariable Long[] ids) { + @PathVariable("ids") Long[] ids) { return toAjax(xgStudentService.deleteWithValidByIds(List.of(ids), true)); } } \ No newline at end of file diff --git a/backend/ruoyi-modules/ruoyi-xg/src/main/java/org/dromara/xg/controller/XgStudentDynamicsController.java b/backend/ruoyi-modules/ruoyi-xg/src/main/java/org/dromara/xg/controller/XgStudentDynamicsController.java index d22237d9..9aaa4bee 100644 --- a/backend/ruoyi-modules/ruoyi-xg/src/main/java/org/dromara/xg/controller/XgStudentDynamicsController.java +++ b/backend/ruoyi-modules/ruoyi-xg/src/main/java/org/dromara/xg/controller/XgStudentDynamicsController.java @@ -63,7 +63,7 @@ public class XgStudentDynamicsController extends BaseController { */ // @SaCheckPermission("studentDynamics:dormApplication:query") @GetMapping("/dormApplication/{id}") - public R getDormApplicationInfo(@NotNull(message = "主键不能为空") @PathVariable Long id) { + public R getDormApplicationInfo(@NotNull(message = "主键不能为空") @PathVariable("id") Long id) { return R.ok(xgStudentDynamicsService.queryDormApplicationById(id)); } @@ -72,7 +72,7 @@ public class XgStudentDynamicsController extends BaseController { */ // @SaCheckPermission("studentDynamics:holidayStay:query") @GetMapping("/holidayStay/{id}") - public R getHolidayStayInfo(@NotNull(message = "主键不能为空") @PathVariable Long id) { + public R getHolidayStayInfo(@NotNull(message = "主键不能为空") @PathVariable("id") Long id) { return R.ok(xgStudentDynamicsService.queryHolidayStayById(id)); } @@ -81,7 +81,7 @@ public class XgStudentDynamicsController extends BaseController { */ // @SaCheckPermission("studentDynamics:studentLeave:query") @GetMapping("/studentLeave/{id}") - public R getStudentLeaveInfo(@NotNull(message = "主键不能为空") @PathVariable Long id) { + public R getStudentLeaveInfo(@NotNull(message = "主键不能为空") @PathVariable("id") Long id) { return R.ok(xgStudentDynamicsService.queryStudentLeaveById(id)); } } diff --git a/backend/ruoyi-modules/ruoyi-xg/src/main/java/org/dromara/xg/controller/XgStudentLeaveController.java b/backend/ruoyi-modules/ruoyi-xg/src/main/java/org/dromara/xg/controller/XgStudentLeaveController.java index 9ab6a0d4..267eedb1 100644 --- a/backend/ruoyi-modules/ruoyi-xg/src/main/java/org/dromara/xg/controller/XgStudentLeaveController.java +++ b/backend/ruoyi-modules/ruoyi-xg/src/main/java/org/dromara/xg/controller/XgStudentLeaveController.java @@ -65,7 +65,7 @@ public class XgStudentLeaveController extends BaseController { */ // @SaCheckPermission("studentLeave:studentLeave:query") @GetMapping("/{id}") - public R getInfo(@NotNull(message = "主键不能为空") @PathVariable Long id) { + public R getInfo(@NotNull(message = "主键不能为空") @PathVariable("id") Long id) { return R.ok(xgStudentLeaveService.queryById(id)); } @@ -100,7 +100,7 @@ public class XgStudentLeaveController extends BaseController { // @SaCheckPermission("studentLeave:studentLeave:remove") @Log(title = "学生请假 - 记录学生的请假申请、审批和销假信息", businessType = BusinessType.DELETE) @DeleteMapping("/{ids}") - public R remove(@NotEmpty(message = "主键不能为空") @PathVariable Long[] ids) { + public R remove(@NotEmpty(message = "主键不能为空") @PathVariable("ids") Long[] ids) { return toAjax(xgStudentLeaveService.deleteWithValidByIds(List.of(ids), true)); } @@ -113,8 +113,8 @@ public class XgStudentLeaveController extends BaseController { // @SaCheckPermission("studentLeave:studentLeave:query") @GetMapping("/queryByCheckDate") public R> queryByCheckDate( - @RequestParam String studentIds, - @RequestParam String checkDate) { + @RequestParam("studentIds") String studentIds, + @RequestParam("checkDate") String checkDate) { try { List studentIdList = List.of(studentIds.split(",")) .stream() diff --git a/backend/ruoyi-modules/ruoyi-xg/src/main/java/org/dromara/xg/controller/XgStudentManagerController.java b/backend/ruoyi-modules/ruoyi-xg/src/main/java/org/dromara/xg/controller/XgStudentManagerController.java index cc2fac4a..5e38bcc7 100644 --- a/backend/ruoyi-modules/ruoyi-xg/src/main/java/org/dromara/xg/controller/XgStudentManagerController.java +++ b/backend/ruoyi-modules/ruoyi-xg/src/main/java/org/dromara/xg/controller/XgStudentManagerController.java @@ -108,7 +108,7 @@ public class XgStudentManagerController extends BaseController { */ // @SaCheckPermission("xgStudentManager:studentManager:query") @GetMapping("/{id}") - public R getInfo(@NotNull(message = "主键不能为空") @PathVariable Long id) { + public R getInfo(@NotNull(message = "主键不能为空") @PathVariable("id") Long id) { return R.ok(xgStudentManagerService.queryById(id)); } @@ -142,7 +142,7 @@ public class XgStudentManagerController extends BaseController { // @SaCheckPermission("xgStudentManager:studentManager:remove") @Log(title = "宿舍管理员信息", businessType = BusinessType.DELETE) @DeleteMapping("/{ids}") - public R remove(@NotEmpty(message = "主键不能为空") @PathVariable Long[] ids) { + public R remove(@NotEmpty(message = "主键不能为空") @PathVariable("ids") Long[] ids) { return toAjax(xgStudentManagerService.deleteWithValidByIds(List.of(ids), true)); } } diff --git a/backend/ruoyi-modules/ruoyi-xg/src/main/java/org/dromara/xg/controller/XgStudentManagerSourceController.java b/backend/ruoyi-modules/ruoyi-xg/src/main/java/org/dromara/xg/controller/XgStudentManagerSourceController.java index 5b2d9d08..44b20c57 100644 --- a/backend/ruoyi-modules/ruoyi-xg/src/main/java/org/dromara/xg/controller/XgStudentManagerSourceController.java +++ b/backend/ruoyi-modules/ruoyi-xg/src/main/java/org/dromara/xg/controller/XgStudentManagerSourceController.java @@ -64,7 +64,7 @@ public class XgStudentManagerSourceController extends BaseController { */ // @SaCheckPermission("xgStudentManagerSource:studentManagerSource:query") @GetMapping("/{id}") - public R getInfo(@NotNull(message = "主键不能为空") @PathVariable Long id) { + public R getInfo(@NotNull(message = "主键不能为空") @PathVariable("id") Long id) { return R.ok(xgStudentManagerSourceService.queryById(id)); } @@ -98,7 +98,7 @@ public class XgStudentManagerSourceController extends BaseController { // @SaCheckPermission("xgStudentManagerSource:studentManagerSource:remove") @Log(title = "学生管理员授权关系", businessType = BusinessType.DELETE) @DeleteMapping("/{ids}") - public R remove(@NotEmpty(message = "主键不能为空") @PathVariable Long[] ids) { + public R remove(@NotEmpty(message = "主键不能为空") @PathVariable("ids") Long[] ids) { return toAjax(xgStudentManagerSourceService.deleteWithValidByIds(List.of(ids), true)); } @@ -111,7 +111,7 @@ public class XgStudentManagerSourceController extends BaseController { // @SaCheckPermission("xgStudentManagerSource:studentManagerSource:grantDeptAuth") @Log(title = "学生管理员授权关系", businessType = BusinessType.UPDATE) @PostMapping("/grantDeptAuth") - public R grantDeptAuth(@RequestParam Long managerId, @RequestBody List authSourceIds) { + public R grantDeptAuth(@RequestParam("managerId") Long managerId, @RequestBody List authSourceIds) { xgStudentManagerSourceService.grantDeptAuth(managerId, authSourceIds); return R.ok(); } @@ -124,7 +124,7 @@ public class XgStudentManagerSourceController extends BaseController { */ // @SaCheckPermission("xgStudentManagerSource:studentManagerSource:query") @GetMapping("/authSourceNames") - public R> getAuthSourceNames(@RequestParam Long managerId) { + public R> getAuthSourceNames(@RequestParam("managerId") Long managerId) { return R.ok(xgStudentManagerSourceService.getAuthSourceNames(managerId)); } diff --git a/backend/ruoyi-modules/ruoyi-xg/src/main/java/org/dromara/xg/controller/XgStudentMsgBatchController.java b/backend/ruoyi-modules/ruoyi-xg/src/main/java/org/dromara/xg/controller/XgStudentMsgBatchController.java index a36d3a7d..6c9ed299 100644 --- a/backend/ruoyi-modules/ruoyi-xg/src/main/java/org/dromara/xg/controller/XgStudentMsgBatchController.java +++ b/backend/ruoyi-modules/ruoyi-xg/src/main/java/org/dromara/xg/controller/XgStudentMsgBatchController.java @@ -64,7 +64,7 @@ public class XgStudentMsgBatchController extends BaseController { */ // @SaCheckPermission("studentMsgBatch:studentMsgBatch:query") @GetMapping("/{id}") - public R getInfo(@NotNull(message = "主键不能为空") @PathVariable Long id) { + public R getInfo(@NotNull(message = "主键不能为空") @PathVariable("id") Long id) { return R.ok(xgStudentMsgBatchService.queryById(id)); } @@ -98,7 +98,7 @@ public class XgStudentMsgBatchController extends BaseController { // @SaCheckPermission("studentMsgBatch:studentMsgBatch:remove") @Log(title = "学生信息批次收集", businessType = BusinessType.DELETE) @DeleteMapping("/{ids}") - public R remove(@NotEmpty(message = "主键不能为空") @PathVariable Long[] ids) { + public R remove(@NotEmpty(message = "主键不能为空") @PathVariable("ids") Long[] ids) { return toAjax(xgStudentMsgBatchService.deleteWithValidByIds(List.of(ids), true)); } @@ -109,7 +109,7 @@ public class XgStudentMsgBatchController extends BaseController { */ // @SaCheckPermission("studentMsgBatch:studentMsgBatch:query") @GetMapping("/history/{batchId}") - public R> getStudentMsgHistory(@NotNull(message = "批次ID不能为空") @PathVariable Long batchId) { + public R> getStudentMsgHistory(@NotNull(message = "批次ID不能为空") @PathVariable("batchId") Long batchId) { return R.ok(xgStudentMsgBatchService.getStudentMsgHistory(batchId)); } @@ -121,8 +121,8 @@ public class XgStudentMsgBatchController extends BaseController { */ // @SaCheckPermission("studentMsgBatch:studentMsgBatch:query") @GetMapping("/history/{batchId}/{userId}") - public R> getStudentMsgHistory(@NotNull(message = "批次ID不能为空") @PathVariable Long batchId, - @NotNull(message = "用户ID不能为空") @PathVariable Long userId) { + public R> getStudentMsgHistory(@NotNull(message = "批次ID不能为空") @PathVariable("batchId") Long batchId, + @NotNull(message = "用户ID不能为空") @PathVariable("userId") Long userId) { return R.ok(xgStudentMsgBatchService.getStudentMsgHistory(batchId, userId)); } @@ -133,7 +133,7 @@ public class XgStudentMsgBatchController extends BaseController { */ // @SaCheckPermission("studentMsgBatch:studentMsgBatch:query") @GetMapping("/userHistoryData/{batchId}") - public R getUserHistoryData(@NotNull(message = "批次ID不能为空") @PathVariable Long batchId) { + public R getUserHistoryData(@NotNull(message = "批次ID不能为空") @PathVariable("batchId") Long batchId) { return R.ok(xgStudentMsgBatchService.getUserHistoryData(batchId)); } @@ -145,8 +145,8 @@ public class XgStudentMsgBatchController extends BaseController { */ // @SaCheckPermission("studentMsgBatch:studentMsgBatch:query") @GetMapping("/userHistoryData/{batchId}/{userId}") - public R getUserHistoryData(@NotNull(message = "批次ID不能为空") @PathVariable Long batchId, - @NotNull(message = "用户ID不能为空") @PathVariable Long userId) { + public R getUserHistoryData(@NotNull(message = "批次ID不能为空") @PathVariable("batchId") Long batchId, + @NotNull(message = "用户ID不能为空") @PathVariable("userId") Long userId) { return R.ok(xgStudentMsgBatchService.getUserHistoryData(batchId, userId)); } @@ -175,12 +175,12 @@ public class XgStudentMsgBatchController extends BaseController { // @SaCheckPermission("studentMsgBatch:studentMsgBatch:query") @GetMapping("/listByDept") public TableDataInfo listByDeptId( - @RequestParam(required = true) Long batchId, - @RequestParam(required = true) Long deptId, - @RequestParam(required = false) String name, - @RequestParam(required = false) String studentNo, - @RequestParam(required = false) String phone, - @RequestParam(required = false) String infoStatus, + @RequestParam(value = "batchId", required = true) Long batchId, + @RequestParam(value = "deptId", required = true) Long deptId, + @RequestParam(value = "name", required = false) String name, + @RequestParam(value = "studentNo", required = false) String studentNo, + @RequestParam(value = "phone", required = false) String phone, + @RequestParam(value = "infoStatus", required = false) String infoStatus, PageQuery pageQuery) { return xgStudentMsgBatchService.queryPageListByDeptId(batchId, deptId, name, studentNo, phone, infoStatus, pageQuery); @@ -216,7 +216,7 @@ public class XgStudentMsgBatchController extends BaseController { @PostMapping("/approveStudentMsg") public R approveStudentMsg(@RequestParam @NotNull(message = "批次ID不能为空") Long batchId, @RequestParam @NotNull(message = "用户ID不能为空") Long userId, - @RequestParam(required = false) String remark) { + @RequestParam(value = "remark", required = false) String remark) { return toAjax(xgStudentMsgBatchService.approveStudentMsg(batchId, userId, remark)); } diff --git a/backend/ruoyi-modules/ruoyi-xg/src/main/java/org/dromara/xg/controller/XgStudentMsgController.java b/backend/ruoyi-modules/ruoyi-xg/src/main/java/org/dromara/xg/controller/XgStudentMsgController.java index 8f7dca74..199344ed 100644 --- a/backend/ruoyi-modules/ruoyi-xg/src/main/java/org/dromara/xg/controller/XgStudentMsgController.java +++ b/backend/ruoyi-modules/ruoyi-xg/src/main/java/org/dromara/xg/controller/XgStudentMsgController.java @@ -511,7 +511,7 @@ public class XgStudentMsgController extends BaseController { // @SaCheckPermission("studentMsg:studentMsg:export") @Log(title = "学生信息", businessType = BusinessType.EXPORT) @PostMapping("/export") - public void export(@RequestParam Map requestBody, HttpServletResponse response) { + public void export(@RequestParam("requestBody") Map requestBody, HttpServletResponse response) { // 预加载导出所需的字典数据 preloadExportDicts(); @@ -651,7 +651,7 @@ public class XgStudentMsgController extends BaseController { */ // @SaCheckPermission("studentMsg:studentMsg:query") @GetMapping("/{id}") - public R getInfo(@NotNull(message = "主键不能为空") @PathVariable Long id) { + public R getInfo(@NotNull(message = "主键不能为空") @PathVariable("id") Long id) { return R.ok(xgStudentMsgService.queryById(id)); } @@ -746,7 +746,7 @@ public class XgStudentMsgController extends BaseController { // @SaCheckPermission("studentMsg:studentMsg:remove") @Log(title = "学生信息", businessType = BusinessType.DELETE) @DeleteMapping("/{ids}") - public R remove(@NotEmpty(message = "主键不能为空") @PathVariable Long[] ids) { + public R remove(@NotEmpty(message = "主键不能为空") @PathVariable("ids") Long[] ids) { return toAjax(xgStudentMsgService.deleteWithValidByIds(List.of(ids), true)); } @@ -758,7 +758,7 @@ public class XgStudentMsgController extends BaseController { */ // @SaCheckPermission("studentMsg:studentMsg:query") @GetMapping("/personalInfo") - public R getPersonalInfo(@RequestParam(required = false) Long userId) { + public R getPersonalInfo(@RequestParam(value = "userId", required = false) Long userId) { XgStudentMsgVo personalInfo = xgStudentMsgService.queryPersonalInfo(userId); if (personalInfo == null) { return R.fail("未找到学生信息"); @@ -776,8 +776,8 @@ public class XgStudentMsgController extends BaseController { // @SaCheckPermission("studentMsg:studentMsg:query") @GetMapping("/listByClassId") public R> getStudentsByClassId( - @RequestParam(required = true) String classId, - @RequestParam(required = false) String name) { + @RequestParam(value = "classId", required = true) String classId, + @RequestParam(value = "name", required = false) String name) { List students = xgStudentMsgService.queryStudentsByClassId(classId, name); return R.ok(students); } @@ -808,7 +808,7 @@ public class XgStudentMsgController extends BaseController { */ // @SaCheckPermission("studentMsg:studentMsg:query") @GetMapping("/getClassTeacherId/{studentId}") - public R getClassTeacherId(@NotNull(message = "学生ID不能为空") @PathVariable Long studentId) { + public R getClassTeacherId(@NotNull(message = "学生ID不能为空") @PathVariable("studentId") Long studentId) { log.info("根据学生ID获取班主任ID - 学生ID: {}", studentId); Long classTeacherId = xgStudentMsgService.getClassTeacherIdByStudentId(studentId); if (classTeacherId == null) { @@ -825,7 +825,7 @@ public class XgStudentMsgController extends BaseController { */ // @SaCheckPermission("studentMsg:studentMsg:query") @GetMapping("/getCollegeLeaveApprovers/{studentId}") - public R> getCollegeLeaveApprovers(@NotNull(message = "学生ID不能为空") @PathVariable Long studentId) { + public R> getCollegeLeaveApprovers(@NotNull(message = "学生ID不能为空") @PathVariable("studentId") Long studentId) { log.info("根据学生ID获取学院请假审批人列表 - 学生ID: {}", studentId); List approverUserIds = xgStudentMsgService.getCollegeLeaveApproversByStudentId(studentId); if (approverUserIds.isEmpty()) { @@ -842,7 +842,7 @@ public class XgStudentMsgController extends BaseController { */ // @SaCheckPermission("studentMsg:studentMsg:query") @GetMapping("/getCollegeLeaders/{studentId}") - public R> getCollegeLeaders(@NotNull(message = "学生ID不能为空") @PathVariable Long studentId) { + public R> getCollegeLeaders(@NotNull(message = "学生ID不能为空") @PathVariable("studentId") Long studentId) { log.info("根据学生ID获取二级学院分管领导ID列表 - 学生ID: {}", studentId); List leaderIds = xgStudentMsgService.getCollegeLeadersByStudentId(studentId); if (leaderIds.isEmpty()) { diff --git a/backend/ruoyi-modules/ruoyi-xg/src/main/java/org/dromara/xg/controller/XgStudentStatisticsController.java b/backend/ruoyi-modules/ruoyi-xg/src/main/java/org/dromara/xg/controller/XgStudentStatisticsController.java index ff453700..0fb3c901 100644 --- a/backend/ruoyi-modules/ruoyi-xg/src/main/java/org/dromara/xg/controller/XgStudentStatisticsController.java +++ b/backend/ruoyi-modules/ruoyi-xg/src/main/java/org/dromara/xg/controller/XgStudentStatisticsController.java @@ -65,7 +65,7 @@ public class XgStudentStatisticsController extends BaseController { // @SaCheckPermission("xg:studentStatistics:query") @GetMapping("/majors/{collegeId}") public R> getMajorsByCollegeId( - @NotNull(message = "学院ID不能为空") @PathVariable Long collegeId) { + @NotNull(message = "学院ID不能为空") @PathVariable("collegeId") Long collegeId) { return R.ok(studentStatisticsService.getMajorsByCollegeId(collegeId)); } @@ -75,7 +75,7 @@ public class XgStudentStatisticsController extends BaseController { // @SaCheckPermission("xg:studentStatistics:query") @GetMapping("/classes/{majorId}") public R> getClassesByMajorId( - @NotNull(message = "专业ID不能为空") @PathVariable Long majorId) { + @NotNull(message = "专业ID不能为空") @PathVariable("majorId") Long majorId) { return R.ok(studentStatisticsService.getClassesByMajorId(majorId)); } diff --git a/backend/ruoyi-modules/ruoyi-xg/src/main/java/org/dromara/xg/controller/XgStudentStatusChangeController.java b/backend/ruoyi-modules/ruoyi-xg/src/main/java/org/dromara/xg/controller/XgStudentStatusChangeController.java index 8aa204e2..b62063ba 100644 --- a/backend/ruoyi-modules/ruoyi-xg/src/main/java/org/dromara/xg/controller/XgStudentStatusChangeController.java +++ b/backend/ruoyi-modules/ruoyi-xg/src/main/java/org/dromara/xg/controller/XgStudentStatusChangeController.java @@ -63,7 +63,7 @@ public class XgStudentStatusChangeController extends BaseController { */ // @SaCheckPermission("studentMsg:studentStatusChange:query") @GetMapping("/{id}") - public R getInfo(@NotNull(message = "主键不能为空") @PathVariable Long id) { + public R getInfo(@NotNull(message = "主键不能为空") @PathVariable("id") Long id) { return R.ok(xgStudentStatusChangeService.queryById(id)); } @@ -122,7 +122,7 @@ public class XgStudentStatusChangeController extends BaseController { // @SaCheckPermission("studentMsg:studentStatusChange:remove") @Log(title = "学生学籍异动", businessType = BusinessType.DELETE) @DeleteMapping("/{ids}") - public R remove(@NotEmpty(message = "主键不能为空") @PathVariable Long[] ids) { + public R remove(@NotEmpty(message = "主键不能为空") @PathVariable("ids") Long[] ids) { return toAjax(xgStudentStatusChangeService.deleteWithValidByIds(List.of(ids), true)); } diff --git a/backend/ruoyi-modules/ruoyi-xg/src/main/java/org/dromara/xg/controller/XgSysDeptController.java b/backend/ruoyi-modules/ruoyi-xg/src/main/java/org/dromara/xg/controller/XgSysDeptController.java index d618a84d..c6aada3d 100644 --- a/backend/ruoyi-modules/ruoyi-xg/src/main/java/org/dromara/xg/controller/XgSysDeptController.java +++ b/backend/ruoyi-modules/ruoyi-xg/src/main/java/org/dromara/xg/controller/XgSysDeptController.java @@ -55,7 +55,7 @@ public class XgSysDeptController { @Operation(summary = "根据学院ID获取专业列表") // @SaCheckPermission("xg:college:list") @GetMapping("/majors/{collegeId}") - public R> majors(@PathVariable Long collegeId) { + public R> majors(@PathVariable("collegeId") Long collegeId) { List depts = deptService.selectMajorListByCollegeId(collegeId); return R.ok(depts); } diff --git a/backend/ruoyi-modules/ruoyi-xljk/src/main/java/org/dromara/xljk/controller/XljkConsultationAppointmentController.java b/backend/ruoyi-modules/ruoyi-xljk/src/main/java/org/dromara/xljk/controller/XljkConsultationAppointmentController.java index 7350b1b0..bc39a36d 100644 --- a/backend/ruoyi-modules/ruoyi-xljk/src/main/java/org/dromara/xljk/controller/XljkConsultationAppointmentController.java +++ b/backend/ruoyi-modules/ruoyi-xljk/src/main/java/org/dromara/xljk/controller/XljkConsultationAppointmentController.java @@ -46,7 +46,7 @@ public class XljkConsultationAppointmentController extends BaseController { } @GetMapping("/{id}") - public R get(@PathVariable Long id) { + public R get(@PathVariable("id") Long id) { log.info("查询预约记录详情,ID: {}", id); XljkConsultationAppointmentVo vo = service.selectById(id); log.info("查询结果: {}", vo); @@ -78,7 +78,7 @@ public class XljkConsultationAppointmentController extends BaseController { } @DeleteMapping("/{id}") - public R remove(@PathVariable Long id) { + public R remove(@PathVariable("id") Long id) { boolean result = service.deleteById(id); if (result) { return R.ok(true); @@ -104,7 +104,7 @@ public class XljkConsultationAppointmentController extends BaseController { @GetMapping("/available-detail-slots") public R> getAvailableDetailSlots( @RequestParam @DateTimeFormat(pattern = "yyyy-MM-dd") Date date, - @RequestParam String timeSlot) { + @RequestParam("timeSlot") String timeSlot) { List detailSlots = service.getAvailableDetailSlots(date, timeSlot); return R.ok(detailSlots); } @@ -127,8 +127,8 @@ public class XljkConsultationAppointmentController extends BaseController { */ @GetMapping("/my-appointments/{studentId}") public R> getMyAppointments( - @PathVariable Long studentId, - @RequestParam(required = false) Boolean force, + @PathVariable("studentId") Long studentId, + @RequestParam(value = "force", required = false) Boolean force, HttpServletResponse response) { log.info("获取我的预约记录,studentId: {}, force: {}", studentId, force); @@ -155,7 +155,7 @@ public class XljkConsultationAppointmentController extends BaseController { */ @PostMapping("/record-consultation/{id}") public R recordConsultation( - @PathVariable Long id, + @PathVariable("id") Long id, @RequestBody Map requestBody) { log.info("记录咨询结果,ID: {}, 请求体: {}", id, requestBody); @@ -248,7 +248,7 @@ public class XljkConsultationAppointmentController extends BaseController { * 获取专业选项 */ @GetMapping("/options/majors") - public R>> getMajorOptions(@RequestParam(required = false) String collegeName) { + public R>> getMajorOptions(@RequestParam(value = "collegeName", required = false) String collegeName) { log.info("获取专业选项,院系名称: {}", collegeName); List> result = service.getMajorOptions(collegeName); return R.ok(result); @@ -259,8 +259,8 @@ public class XljkConsultationAppointmentController extends BaseController { */ @GetMapping("/options/classes") public R>> getClassOptions( - @RequestParam(required = false) String collegeName, - @RequestParam(required = false) String majorName + @RequestParam(value = "collegeName", required = false) String collegeName, + @RequestParam(value = "majorName", required = false) String majorName ) { log.info("获取班级选项,院系名称: {}, 专业名称: {}", collegeName, majorName); List> result = service.getClassOptions(collegeName, majorName); @@ -381,7 +381,7 @@ public class XljkConsultationAppointmentController extends BaseController { * 获取日历视图的排班数据(带预约状态) */ @GetMapping("/calendar-schedules") - public R> getCalendarSchedules(@RequestParam String startDate, @RequestParam String endDate) { + public R> getCalendarSchedules(@RequestParam("startDate") String startDate, @RequestParam("endDate") String endDate) { List schedules = service.getCalendarSchedules(startDate, endDate); return R.ok(schedules); } diff --git a/backend/ruoyi-modules/ruoyi-xljk/src/main/java/org/dromara/xljk/controller/XljkConsultationCounselorController.java b/backend/ruoyi-modules/ruoyi-xljk/src/main/java/org/dromara/xljk/controller/XljkConsultationCounselorController.java index e4bbf3b5..f3d9129f 100644 --- a/backend/ruoyi-modules/ruoyi-xljk/src/main/java/org/dromara/xljk/controller/XljkConsultationCounselorController.java +++ b/backend/ruoyi-modules/ruoyi-xljk/src/main/java/org/dromara/xljk/controller/XljkConsultationCounselorController.java @@ -19,7 +19,7 @@ public class XljkConsultationCounselorController { } @GetMapping("/{id}") - public XljkConsultationCounselorVo get(@PathVariable Long id) { + public XljkConsultationCounselorVo get(@PathVariable("id") Long id) { return service.selectById(id); } @@ -34,7 +34,7 @@ public class XljkConsultationCounselorController { } @DeleteMapping("/{id}") - public boolean remove(@PathVariable Long id) { + public boolean remove(@PathVariable("id") Long id) { return service.deleteById(id); } } \ No newline at end of file diff --git a/backend/ruoyi-modules/ruoyi-xljk/src/main/java/org/dromara/xljk/controller/XljkConsultationDebugController.java b/backend/ruoyi-modules/ruoyi-xljk/src/main/java/org/dromara/xljk/controller/XljkConsultationDebugController.java index 389f6dea..1ecb218b 100644 --- a/backend/ruoyi-modules/ruoyi-xljk/src/main/java/org/dromara/xljk/controller/XljkConsultationDebugController.java +++ b/backend/ruoyi-modules/ruoyi-xljk/src/main/java/org/dromara/xljk/controller/XljkConsultationDebugController.java @@ -53,7 +53,7 @@ public class XljkConsultationDebugController { * @return 预约记录 */ @GetMapping("/appointments/{studentId}") - public R>> getAppointmentsByStudentId(@PathVariable String studentId) { + public R>> getAppointmentsByStudentId(@PathVariable("studentId") String studentId) { try { String sql = "SELECT * FROM xljk_consultation_appointment WHERE student_id = ?"; List> result = jdbcTemplate.queryForList(sql, studentId); @@ -70,7 +70,7 @@ public class XljkConsultationDebugController { * @return 学生信息 */ @GetMapping("/student/{studentNo}") - public R> getStudentInfo(@PathVariable String studentNo) { + public R> getStudentInfo(@PathVariable("studentNo") String studentNo) { try { // 这里假设学生信息存储在sys_user表中,可能需要根据实际情况调整 String sql = "SELECT * FROM sys_user WHERE user_name = ?"; diff --git a/backend/ruoyi-modules/ruoyi-xljk/src/main/java/org/dromara/xljk/controller/XljkConsultationNoShowController.java b/backend/ruoyi-modules/ruoyi-xljk/src/main/java/org/dromara/xljk/controller/XljkConsultationNoShowController.java index e9e58beb..6be71119 100644 --- a/backend/ruoyi-modules/ruoyi-xljk/src/main/java/org/dromara/xljk/controller/XljkConsultationNoShowController.java +++ b/backend/ruoyi-modules/ruoyi-xljk/src/main/java/org/dromara/xljk/controller/XljkConsultationNoShowController.java @@ -46,7 +46,7 @@ public class XljkConsultationNoShowController extends BaseController { */ // @SaCheckPermission("xljk:consultationnoshow:query") @GetMapping("/{id}") - public R get(@PathVariable Long id) { + public R get(@PathVariable("id") Long id) { return R.ok(service.selectById(id)); } @@ -55,7 +55,7 @@ public class XljkConsultationNoShowController extends BaseController { */ // @SaCheckPermission("xljk:consultationnoshow:release") @PutMapping("/{id}/release") - public R release(@PathVariable Long id) { + public R release(@PathVariable("id") Long id) { return R.ok(service.releaseLimitation(id)); } @@ -63,7 +63,7 @@ public class XljkConsultationNoShowController extends BaseController { * 检查学生是否被限制预约 */ @GetMapping("/check-limitation") - public R> checkLimitation(@RequestParam Long studentId) { + public R> checkLimitation(@RequestParam("studentId") Long studentId) { return R.ok(service.checkLimitation(studentId)); } } \ No newline at end of file diff --git a/backend/ruoyi-modules/ruoyi-xljk/src/main/java/org/dromara/xljk/controller/XljkConsultationRecordController.java b/backend/ruoyi-modules/ruoyi-xljk/src/main/java/org/dromara/xljk/controller/XljkConsultationRecordController.java index 5c26ae09..57797719 100644 --- a/backend/ruoyi-modules/ruoyi-xljk/src/main/java/org/dromara/xljk/controller/XljkConsultationRecordController.java +++ b/backend/ruoyi-modules/ruoyi-xljk/src/main/java/org/dromara/xljk/controller/XljkConsultationRecordController.java @@ -19,7 +19,7 @@ public class XljkConsultationRecordController { } @GetMapping("/{id}") - public XljkConsultationRecordVo get(@PathVariable Long id) { + public XljkConsultationRecordVo get(@PathVariable("id") Long id) { return service.selectById(id); } @@ -34,7 +34,7 @@ public class XljkConsultationRecordController { } @DeleteMapping("/{id}") - public boolean remove(@PathVariable Long id) { + public boolean remove(@PathVariable("id") Long id) { return service.deleteById(id); } } \ No newline at end of file diff --git a/backend/ruoyi-modules/ruoyi-xljk/src/main/java/org/dromara/xljk/controller/XljkConsultationScheduleController.java b/backend/ruoyi-modules/ruoyi-xljk/src/main/java/org/dromara/xljk/controller/XljkConsultationScheduleController.java index 367aa0cc..5a705170 100644 --- a/backend/ruoyi-modules/ruoyi-xljk/src/main/java/org/dromara/xljk/controller/XljkConsultationScheduleController.java +++ b/backend/ruoyi-modules/ruoyi-xljk/src/main/java/org/dromara/xljk/controller/XljkConsultationScheduleController.java @@ -38,7 +38,7 @@ public class XljkConsultationScheduleController { } @GetMapping("/{id}") - public XljkConsultationScheduleVo get(@PathVariable Long id) { + public XljkConsultationScheduleVo get(@PathVariable("id") Long id) { return service.selectById(id); } @@ -195,7 +195,7 @@ public class XljkConsultationScheduleController { } @DeleteMapping("/{id}") - public boolean remove(@PathVariable Long id) { + public boolean remove(@PathVariable("id") Long id) { return service.deleteById(id); } diff --git a/backend/ruoyi-modules/ruoyi-xljk/src/main/java/org/dromara/xljk/controller/XljkConsulterController.java b/backend/ruoyi-modules/ruoyi-xljk/src/main/java/org/dromara/xljk/controller/XljkConsulterController.java index 68457d38..1016bdfc 100644 --- a/backend/ruoyi-modules/ruoyi-xljk/src/main/java/org/dromara/xljk/controller/XljkConsulterController.java +++ b/backend/ruoyi-modules/ruoyi-xljk/src/main/java/org/dromara/xljk/controller/XljkConsulterController.java @@ -65,7 +65,7 @@ public class XljkConsulterController extends BaseController { // @SaCheckPermission("xljk:consulter:query") @GetMapping("/{id}") public R getInfo(@NotNull(message = "主键不能为空") - @PathVariable Long id) { + @PathVariable("id") Long id) { return R.ok(xljkConsulterService.queryById(id)); } @@ -98,7 +98,7 @@ public class XljkConsulterController extends BaseController { @Log(title = "心理咨询师配置", businessType = BusinessType.DELETE) @DeleteMapping("/{ids}") public R remove(@NotEmpty(message = "主键不能为空") - @PathVariable Long[] ids) { + @PathVariable("ids") Long[] ids) { return toAjax(xljkConsulterService.deleteWithValidByIds(List.of(ids))); } @@ -147,7 +147,7 @@ public class XljkConsulterController extends BaseController { */ // @SaCheckPermission("xljk:consulter:list") @GetMapping("/users/{deptId}") - public R> listUserByDeptId(@PathVariable String deptId) { + public R> listUserByDeptId(@PathVariable("deptId") String deptId) { List users = sysUserService.selectUserListByDept(Long.valueOf(deptId)); return R.ok(users); } diff --git a/backend/ruoyi-modules/ruoyi-xljk/src/main/java/org/dromara/xljk/controller/XljkEvaluationController.java b/backend/ruoyi-modules/ruoyi-xljk/src/main/java/org/dromara/xljk/controller/XljkEvaluationController.java index 15be04e0..0a4c4909 100644 --- a/backend/ruoyi-modules/ruoyi-xljk/src/main/java/org/dromara/xljk/controller/XljkEvaluationController.java +++ b/backend/ruoyi-modules/ruoyi-xljk/src/main/java/org/dromara/xljk/controller/XljkEvaluationController.java @@ -84,7 +84,7 @@ public class XljkEvaluationController extends BaseController { */ // @SaCheckPermission("xljk:evaluation:query") @GetMapping("/{id}") - public R getInfo(@NotNull(message = "主键不能为空") @PathVariable Long id) { + public R getInfo(@NotNull(message = "主键不能为空") @PathVariable("id") Long id) { return R.ok(evaluationService.queryById(id)); } @@ -121,7 +121,7 @@ public class XljkEvaluationController extends BaseController { // @SaCheckPermission("xljk:evaluation:remove") @Log(title = "心理健康测评", businessType = BusinessType.DELETE) @DeleteMapping("/{ids}") - public R remove(@NotEmpty(message = "主键不能为空") @PathVariable Long[] ids) { + public R remove(@NotEmpty(message = "主键不能为空") @PathVariable("ids") Long[] ids) { return toAjax(evaluationService.deleteWithValidByIds(List.of(ids), true)); } @@ -140,7 +140,7 @@ public class XljkEvaluationController extends BaseController { // @SaCheckPermission("xljk:evaluation:query") @GetMapping("/options/majorAndClass") public R>>> getMajorAndClassOptions( - @RequestParam(required = false) Long departmentId + @RequestParam(value = "departmentId", required = false) Long departmentId ) { return R.ok(evaluationService.getMajorAndClassOptions(departmentId)); } @@ -161,7 +161,7 @@ public class XljkEvaluationController extends BaseController { @Log(title = "提交测评", businessType = BusinessType.UPDATE) @RepeatSubmit() @PutMapping("/{id}/publish") - public R publishEvaluation(@NotNull(message = "测评ID不能为空") @PathVariable Long id) { + public R publishEvaluation(@NotNull(message = "测评ID不能为空") @PathVariable("id") Long id) { return toAjax(evaluationService.publishEvaluation(id)); } @@ -172,7 +172,7 @@ public class XljkEvaluationController extends BaseController { @Log(title = "提交测评", businessType = BusinessType.UPDATE) @RepeatSubmit() @PutMapping("/{id}/complete") - public R completeEvaluation(@NotNull(message = "测评ID不能为空") @PathVariable Long id) { + public R completeEvaluation(@NotNull(message = "测评ID不能为空") @PathVariable("id") Long id) { return toAjax(evaluationService.completeEvaluation(id)); } @@ -181,7 +181,7 @@ public class XljkEvaluationController extends BaseController { */ // @SaCheckPermission("xljk:evaluation:statistics") @GetMapping("/{id}/statistics") - public R> getEvaluationStatistics(@NotNull(message = "测评ID不能为空") @PathVariable Long id) { + public R> getEvaluationStatistics(@NotNull(message = "测评ID不能为空") @PathVariable("id") Long id) { return R.ok(evaluationService.getEvaluationStatistics(id)); } @@ -208,7 +208,7 @@ public class XljkEvaluationController extends BaseController { */ // @SaCheckPermission("xljk:evaluation:query") @GetMapping("/options/majors") - public R>> getMajorOptions(@RequestParam(required = false) String collegeName) { + public R>> getMajorOptions(@RequestParam(value = "collegeName", required = false) String collegeName) { return R.ok(evaluationService.getMajorOptions(collegeName)); } @@ -218,8 +218,8 @@ public class XljkEvaluationController extends BaseController { // @SaCheckPermission("xljk:evaluation:query") @GetMapping("/options/classes") public R>> getClassOptions( - @RequestParam(required = false) String collegeName, - @RequestParam(required = false) String majorName + @RequestParam(value = "collegeName", required = false) String collegeName, + @RequestParam(value = "majorName", required = false) String majorName ) { return R.ok(evaluationService.getClassOptions(collegeName, majorName)); } @@ -230,9 +230,9 @@ public class XljkEvaluationController extends BaseController { // @SaCheckPermission("xljk:evaluation:query") @GetMapping("/students") public R>> getStudentsByClass( - @RequestParam(required = false) String collegeName, - @RequestParam(required = false) String majorName, - @RequestParam(required = false) String className + @RequestParam(value = "collegeName", required = false) String collegeName, + @RequestParam(value = "majorName", required = false) String majorName, + @RequestParam(value = "className", required = false) String className ) { return R.ok(evaluationService.getStudentsByClass(collegeName, majorName, className)); } diff --git a/backend/ruoyi-modules/ruoyi-xljk/src/main/java/org/dromara/xljk/controller/XljkEvaluationDetailController.java b/backend/ruoyi-modules/ruoyi-xljk/src/main/java/org/dromara/xljk/controller/XljkEvaluationDetailController.java index f72f720f..d9cfd83f 100644 --- a/backend/ruoyi-modules/ruoyi-xljk/src/main/java/org/dromara/xljk/controller/XljkEvaluationDetailController.java +++ b/backend/ruoyi-modules/ruoyi-xljk/src/main/java/org/dromara/xljk/controller/XljkEvaluationDetailController.java @@ -133,7 +133,7 @@ public class XljkEvaluationDetailController extends BaseController { */ // @SaCheckPermission("xljk:evaluation:query") @GetMapping("/{id}") - public R getInfo(@NotNull(message = "主键不能为空") @PathVariable Long id) { + public R getInfo(@NotNull(message = "主键不能为空") @PathVariable("id") Long id) { return R.ok(detailService.queryById(id)); } @@ -181,7 +181,7 @@ public class XljkEvaluationDetailController extends BaseController { // @SaCheckPermission("xljk:evaluation:remove") @Log(title = "心理健康测评明细", businessType = BusinessType.DELETE) @DeleteMapping("/{ids}") - public R remove(@NotEmpty(message = "主键不能为空") @PathVariable Long[] ids) { + public R remove(@NotEmpty(message = "主键不能为空") @PathVariable("ids") Long[] ids) { return toAjax(detailService.deleteWithValidByIds(List.of(ids), true)); } @@ -190,7 +190,7 @@ public class XljkEvaluationDetailController extends BaseController { */ // @SaCheckPermission("xljk:evaluation:query") @GetMapping("/evaluation/{evaluationId}") - public R> getDetailsByEvaluationId(@NotNull(message = "测评ID不能为空") @PathVariable Long evaluationId) { + public R> getDetailsByEvaluationId(@NotNull(message = "测评ID不能为空") @PathVariable("evaluationId") Long evaluationId) { return R.ok(detailService.queryByEvaluationId(evaluationId)); } @@ -199,7 +199,7 @@ public class XljkEvaluationDetailController extends BaseController { */ // @SaCheckPermission("xljk:evaluation:query") @GetMapping("/students/{classId}") - public R>> getStudentsByClassId(@NotNull(message = "班级ID不能为空") @PathVariable Long classId) { + public R>> getStudentsByClassId(@NotNull(message = "班级ID不能为空") @PathVariable("classId") Long classId) { return R.ok(detailService.getStudentsByClassId(classId)); } diff --git a/backend/ruoyi-modules/ruoyi-xskh/src/main/java/org/dromara/xskh/controller/XskhAssessmentApplicationApprovalController.java b/backend/ruoyi-modules/ruoyi-xskh/src/main/java/org/dromara/xskh/controller/XskhAssessmentApplicationApprovalController.java index 903f362a..7ff12ffc 100644 --- a/backend/ruoyi-modules/ruoyi-xskh/src/main/java/org/dromara/xskh/controller/XskhAssessmentApplicationApprovalController.java +++ b/backend/ruoyi-modules/ruoyi-xskh/src/main/java/org/dromara/xskh/controller/XskhAssessmentApplicationApprovalController.java @@ -53,7 +53,7 @@ public class XskhAssessmentApplicationApprovalController extends BaseController */ // @SaCheckPermission("assessment:application:query") @GetMapping("/{id}") - public R getInfo(@NotNull(message = "主键不能为空") @PathVariable Long id) { + public R getInfo(@NotNull(message = "主键不能为空") @PathVariable("id") Long id) { return R.ok(xskhAssessmentApplicationApprovalService.queryById(id)); } @@ -87,7 +87,7 @@ public class XskhAssessmentApplicationApprovalController extends BaseController // @SaCheckPermission("assessment:application:remove") @Log(title = "学生考核申请、班主任审核", businessType = BusinessType.DELETE) @DeleteMapping("/{ids}") - public R remove(@NotEmpty(message = "主键不能为空") @PathVariable Long[] ids) { + public R remove(@NotEmpty(message = "主键不能为空") @PathVariable("ids") Long[] ids) { return toAjax(xskhAssessmentApplicationApprovalService.deleteWithValidByIds(List.of(ids), true)); } @@ -107,7 +107,7 @@ public class XskhAssessmentApplicationApprovalController extends BaseController // @SaCheckPermission("assessment:application:submit") @Log(title = "提交考核申请", businessType = BusinessType.UPDATE) @PutMapping("/submit/{id}") - public R submitApplication(@NotNull(message = "主键不能为空") @PathVariable Long id) { + public R submitApplication(@NotNull(message = "主键不能为空") @PathVariable("id") Long id) { return toAjax(xskhAssessmentApplicationApprovalService.submitApplication(id)); } @@ -117,7 +117,7 @@ public class XskhAssessmentApplicationApprovalController extends BaseController // @SaCheckPermission("assessment:application:delete") @Log(title = "删除考核申请", businessType = BusinessType.DELETE) @DeleteMapping("/delete/{id}") - public R deleteApplication(@NotNull(message = "主键不能为空") @PathVariable Long id) { + public R deleteApplication(@NotNull(message = "主键不能为空") @PathVariable("id") Long id) { return toAjax(xskhAssessmentApplicationApprovalService.deleteApplication(id)); } @@ -136,8 +136,8 @@ public class XskhAssessmentApplicationApprovalController extends BaseController // @SaCheckPermission("assessment:application:query") @GetMapping("/student/{studentId}/schedule/{scheduleId}") public R getByStudentAndSchedule( - @NotNull(message = "学生ID不能为空") @PathVariable Long studentId, - @NotNull(message = "考核计划ID不能为空") @PathVariable Long scheduleId) { + @NotNull(message = "学生ID不能为空") @PathVariable("studentId") Long studentId, + @NotNull(message = "考核计划ID不能为空") @PathVariable("scheduleId") Long scheduleId) { return R.ok(xskhAssessmentApplicationApprovalService.getByStudentAndSchedule(studentId, scheduleId)); } @@ -147,7 +147,7 @@ public class XskhAssessmentApplicationApprovalController extends BaseController // @SaCheckPermission("assessment:application:query") @GetMapping("/indicators/{scheduleId}") public R> getIndicatorsByScheduleId( - @NotNull(message = "考核计划ID不能为空") @PathVariable Long scheduleId) { + @NotNull(message = "考核计划ID不能为空") @PathVariable("scheduleId") Long scheduleId) { return R.ok(xskhAssessmentApplicationApprovalService.getIndicatorsByScheduleId(scheduleId)); } diff --git a/backend/ruoyi-modules/ruoyi-xskh/src/main/java/org/dromara/xskh/controller/XskhAssessmentApprovalController.java b/backend/ruoyi-modules/ruoyi-xskh/src/main/java/org/dromara/xskh/controller/XskhAssessmentApprovalController.java index 87a216fc..c1ba5892 100644 --- a/backend/ruoyi-modules/ruoyi-xskh/src/main/java/org/dromara/xskh/controller/XskhAssessmentApprovalController.java +++ b/backend/ruoyi-modules/ruoyi-xskh/src/main/java/org/dromara/xskh/controller/XskhAssessmentApprovalController.java @@ -52,7 +52,7 @@ public class XskhAssessmentApprovalController extends BaseController { */ // @SaCheckPermission("assessment:approval:query") @GetMapping("/{id}") - public R getInfo(@NotNull(message = "主键不能为空") @PathVariable Long id) { + public R getInfo(@NotNull(message = "主键不能为空") @PathVariable("id") Long id) { return R.ok(xskhAssessmentApprovalService.queryById(id)); } @@ -86,7 +86,7 @@ public class XskhAssessmentApprovalController extends BaseController { // @SaCheckPermission("assessment:approval:remove") @Log(title = "学生考核审核", businessType = BusinessType.DELETE) @DeleteMapping("/{ids}") - public R remove(@NotEmpty(message = "主键不能为空") @PathVariable Long[] ids) { + public R remove(@NotEmpty(message = "主键不能为空") @PathVariable("ids") Long[] ids) { return toAjax(xskhAssessmentApprovalService.deleteWithValidByIds(List.of(ids), true)); } @@ -113,10 +113,10 @@ public class XskhAssessmentApprovalController extends BaseController { // @SaCheckPermission("assessment:approval:teacherClass") @GetMapping("/teacherClass") public TableDataInfo getTeacherClassApplications( - @RequestParam(required = false) Long scheduleId, - @RequestParam(required = false) String studentNo, - @RequestParam(required = false) String studentName, - @RequestParam(required = false) String status, + @RequestParam(value = "scheduleId", required = false) Long scheduleId, + @RequestParam(value = "studentNo", required = false) String studentNo, + @RequestParam(value = "studentName", required = false) String studentName, + @RequestParam(value = "status", required = false) String status, PageQuery pageQuery) { return xskhAssessmentApprovalService.getTeacherClassApplications(scheduleId, studentNo, studentName, status, pageQuery); diff --git a/backend/ruoyi-modules/ruoyi-xskh/src/main/java/org/dromara/xskh/controller/XskhAssessmentIndicatorController.java b/backend/ruoyi-modules/ruoyi-xskh/src/main/java/org/dromara/xskh/controller/XskhAssessmentIndicatorController.java index 45c1266d..fe762308 100644 --- a/backend/ruoyi-modules/ruoyi-xskh/src/main/java/org/dromara/xskh/controller/XskhAssessmentIndicatorController.java +++ b/backend/ruoyi-modules/ruoyi-xskh/src/main/java/org/dromara/xskh/controller/XskhAssessmentIndicatorController.java @@ -52,7 +52,7 @@ public class XskhAssessmentIndicatorController extends BaseController { */ // @SaCheckPermission("assessment:indicator:query") @GetMapping("/{id}") - public R getInfo(@NotNull(message = "主键不能为空") @PathVariable Long id) { + public R getInfo(@NotNull(message = "主键不能为空") @PathVariable("id") Long id) { return R.ok(xskhAssessmentIndicatorService.getIndicatorWithRelations(id)); } @@ -86,7 +86,7 @@ public class XskhAssessmentIndicatorController extends BaseController { // @SaCheckPermission("assessment:indicator:remove") @Log(title = "学生考核指标体系", businessType = BusinessType.DELETE) @DeleteMapping("/{ids}") - public R remove(@NotEmpty(message = "主键不能为空") @PathVariable Long[] ids) { + public R remove(@NotEmpty(message = "主键不能为空") @PathVariable("ids") Long[] ids) { return toAjax(xskhAssessmentIndicatorService.deleteWithValidByIds(List.of(ids), true)); } diff --git a/backend/ruoyi-modules/ruoyi-xskh/src/main/java/org/dromara/xskh/controller/XskhAssessmentIndicatorTypeController.java b/backend/ruoyi-modules/ruoyi-xskh/src/main/java/org/dromara/xskh/controller/XskhAssessmentIndicatorTypeController.java index 5486f638..4ce774bf 100644 --- a/backend/ruoyi-modules/ruoyi-xskh/src/main/java/org/dromara/xskh/controller/XskhAssessmentIndicatorTypeController.java +++ b/backend/ruoyi-modules/ruoyi-xskh/src/main/java/org/dromara/xskh/controller/XskhAssessmentIndicatorTypeController.java @@ -52,7 +52,7 @@ public class XskhAssessmentIndicatorTypeController extends BaseController { */ // @SaCheckPermission("assessment:indicatorType:query") @GetMapping("/{id}") - public R getInfo(@NotNull(message = "主键不能为空") @PathVariable Long id) { + public R getInfo(@NotNull(message = "主键不能为空") @PathVariable("id") Long id) { return R.ok(xskhAssessmentIndicatorTypeService.queryById(id)); } @@ -86,7 +86,7 @@ public class XskhAssessmentIndicatorTypeController extends BaseController { // @SaCheckPermission("assessment:indicatorType:remove") @Log(title = "学生考核指标体系类型", businessType = BusinessType.DELETE) @DeleteMapping("/{ids}") - public R remove(@NotEmpty(message = "主键不能为空") @PathVariable Long[] ids) { + public R remove(@NotEmpty(message = "主键不能为空") @PathVariable("ids") Long[] ids) { return toAjax(xskhAssessmentIndicatorTypeService.deleteWithValidByIds(List.of(ids), true)); } diff --git a/backend/ruoyi-modules/ruoyi-xskh/src/main/java/org/dromara/xskh/controller/XskhAssessmentPlanController.java b/backend/ruoyi-modules/ruoyi-xskh/src/main/java/org/dromara/xskh/controller/XskhAssessmentPlanController.java index 0eacf620..ea083df0 100644 --- a/backend/ruoyi-modules/ruoyi-xskh/src/main/java/org/dromara/xskh/controller/XskhAssessmentPlanController.java +++ b/backend/ruoyi-modules/ruoyi-xskh/src/main/java/org/dromara/xskh/controller/XskhAssessmentPlanController.java @@ -52,7 +52,7 @@ public class XskhAssessmentPlanController extends BaseController { */ // @SaCheckPermission("assessment:plan:query") @GetMapping("/{id}") - public R getInfo(@NotNull(message = "主键不能为空") @PathVariable Long id) { + public R getInfo(@NotNull(message = "主键不能为空") @PathVariable("id") Long id) { return R.ok(xskhAssessmentPlanService.getPlanWithRelations(id)); } @@ -86,7 +86,7 @@ public class XskhAssessmentPlanController extends BaseController { // @SaCheckPermission("assessment:plan:remove") @Log(title = "学生考核方案", businessType = BusinessType.DELETE) @DeleteMapping("/{ids}") - public R remove(@NotEmpty(message = "主键不能为空") @PathVariable Long[] ids) { + public R remove(@NotEmpty(message = "主键不能为空") @PathVariable("ids") Long[] ids) { return toAjax(xskhAssessmentPlanService.deleteWithValidByIds(List.of(ids), true)); } diff --git a/backend/ruoyi-modules/ruoyi-xskh/src/main/java/org/dromara/xskh/controller/XskhAssessmentScheduleController.java b/backend/ruoyi-modules/ruoyi-xskh/src/main/java/org/dromara/xskh/controller/XskhAssessmentScheduleController.java index 8d3ed457..0916b2d2 100644 --- a/backend/ruoyi-modules/ruoyi-xskh/src/main/java/org/dromara/xskh/controller/XskhAssessmentScheduleController.java +++ b/backend/ruoyi-modules/ruoyi-xskh/src/main/java/org/dromara/xskh/controller/XskhAssessmentScheduleController.java @@ -62,7 +62,7 @@ public class XskhAssessmentScheduleController extends BaseController { */ // @SaCheckPermission("assessment:schedule:query") @GetMapping("/{id}") - public R getInfo(@NotNull(message = "主键不能为空") @PathVariable Long id) { + public R getInfo(@NotNull(message = "主键不能为空") @PathVariable("id") Long id) { return R.ok(xskhAssessmentScheduleService.queryById(id)); } @@ -96,7 +96,7 @@ public class XskhAssessmentScheduleController extends BaseController { // @SaCheckPermission("assessment:schedule:remove") @Log(title = "学生考核计划", businessType = BusinessType.DELETE) @DeleteMapping("/{ids}") - public R remove(@NotEmpty(message = "主键不能为空") @PathVariable Long[] ids) { + public R remove(@NotEmpty(message = "主键不能为空") @PathVariable("ids") Long[] ids) { return toAjax(xskhAssessmentScheduleService.deleteWithValidByIds(List.of(ids), true)); } @@ -106,7 +106,7 @@ public class XskhAssessmentScheduleController extends BaseController { // @SaCheckPermission("assessment:schedule:online") @Log(title = "上线考核计划", businessType = BusinessType.UPDATE) @PutMapping("/online/{id}") - public R online(@NotNull(message = "主键不能为空") @PathVariable Long id) { + public R online(@NotNull(message = "主键不能为空") @PathVariable("id") Long id) { return toAjax(xskhAssessmentScheduleService.onlineSchedule(id)); } @@ -116,7 +116,7 @@ public class XskhAssessmentScheduleController extends BaseController { // @SaCheckPermission("assessment:schedule:offline") @Log(title = "下线考核计划", businessType = BusinessType.UPDATE) @PutMapping("/offline/{id}") - public R offline(@NotNull(message = "主键不能为空") @PathVariable Long id) { + public R offline(@NotNull(message = "主键不能为空") @PathVariable("id") Long id) { return toAjax(xskhAssessmentScheduleService.offlineSchedule(id)); } @@ -126,7 +126,7 @@ public class XskhAssessmentScheduleController extends BaseController { // @SaCheckPermission("assessment:schedule:complete") @Log(title = "完成考核计划", businessType = BusinessType.UPDATE) @PutMapping("/complete/{id}") - public R complete(@NotNull(message = "主键不能为空") @PathVariable Long id) { + public R complete(@NotNull(message = "主键不能为空") @PathVariable("id") Long id) { return toAjax(xskhAssessmentScheduleService.completeSchedule(id)); } } \ No newline at end of file diff --git a/backend/ruoyi-modules/ruoyi-xskh/src/main/java/org/dromara/xskh/controller/XskhDisciplineRecordController.java b/backend/ruoyi-modules/ruoyi-xskh/src/main/java/org/dromara/xskh/controller/XskhDisciplineRecordController.java index 08da0c64..bcded3f5 100644 --- a/backend/ruoyi-modules/ruoyi-xskh/src/main/java/org/dromara/xskh/controller/XskhDisciplineRecordController.java +++ b/backend/ruoyi-modules/ruoyi-xskh/src/main/java/org/dromara/xskh/controller/XskhDisciplineRecordController.java @@ -65,7 +65,7 @@ public class XskhDisciplineRecordController extends BaseController { */ // @SaCheckPermission("disciplineRecord:disciplineRecord:query") @GetMapping("/{id}") - public R getInfo(@NotNull(message = "主键不能为空") @PathVariable Long id) { + public R getInfo(@NotNull(message = "主键不能为空") @PathVariable("id") Long id) { return R.ok(xskhDisciplineRecordService.queryById(id)); } @@ -99,7 +99,7 @@ public class XskhDisciplineRecordController extends BaseController { // @SaCheckPermission("disciplineRecord:disciplineRecord:remove") @Log(title = "学生违纪处分记录", businessType = BusinessType.DELETE) @DeleteMapping("/{ids}") - public R remove(@NotEmpty(message = "主键不能为空") @PathVariable Long[] ids) { + public R remove(@NotEmpty(message = "主键不能为空") @PathVariable("ids") Long[] ids) { return toAjax(xskhDisciplineRecordService.deleteWithValidByIds(List.of(ids), true)); } @@ -108,7 +108,7 @@ public class XskhDisciplineRecordController extends BaseController { */ // @SaCheckPermission("disciplineRecord:disciplineRecord:query") @GetMapping("/studentOptions") - public R> getStudentOptions(@RequestParam(required = false) String keyword) { + public R> getStudentOptions(@RequestParam(value = "keyword", required = false) String keyword) { return R.ok(xskhDisciplineRecordService.getStudentOptions(keyword)); } @@ -118,7 +118,7 @@ public class XskhDisciplineRecordController extends BaseController { // @SaCheckPermission("disciplineRecord:disciplineRecord:query") @GetMapping("/studentOptionsPage") public R> getStudentOptionsPage( - @RequestParam(required = false) String keyword, + @RequestParam(value = "keyword", required = false) String keyword, @RequestParam(required = false, defaultValue = "1") Integer pageNum, @RequestParam(required = false, defaultValue = "20") Integer pageSize) { return R.ok(xskhDisciplineRecordService.getStudentOptionsPage(keyword, pageNum, pageSize)); @@ -149,7 +149,7 @@ public class XskhDisciplineRecordController extends BaseController { */ // @SaCheckPermission("disciplineRecord:disciplineRecord:query") @GetMapping("/getIndicatorTypes/{indicatorId}") - public R> getIndicatorTypes(@NotNull(message = "指标ID不能为空") @PathVariable Long indicatorId) { + public R> getIndicatorTypes(@NotNull(message = "指标ID不能为空") @PathVariable("indicatorId") Long indicatorId) { return R.ok(xskhDisciplineRecordService.getIndicatorTypes(indicatorId)); } @@ -159,10 +159,10 @@ public class XskhDisciplineRecordController extends BaseController { // @SaCheckPermission("disciplineRecord:disciplineRecord:query") @GetMapping("/getStudentDisciplineRecords") public R> getStudentDisciplineRecords( - @RequestParam Long studentId, - @RequestParam String disciplineTypeIds, - @RequestParam String startTime, - @RequestParam String endTime) { + @RequestParam("studentId") Long studentId, + @RequestParam("disciplineTypeIds") String disciplineTypeIds, + @RequestParam("startTime") String startTime, + @RequestParam("endTime") String endTime) { return R.ok(xskhDisciplineRecordService.getStudentDisciplineRecords(studentId, disciplineTypeIds, startTime, endTime)); } @@ -173,9 +173,9 @@ public class XskhDisciplineRecordController extends BaseController { // @SaCheckPermission("disciplineRecord:disciplineRecord:query") @GetMapping("/getMaxScoreByTypeAndPeriod/{typeId}") public R getMaxScoreByTypeAndPeriod( - @NotNull(message = "违纪类型ID不能为空") @PathVariable Long typeId, - @RequestParam String startTime, - @RequestParam String endTime) { + @NotNull(message = "违纪类型ID不能为空") @PathVariable("typeId") Long typeId, + @RequestParam("startTime") String startTime, + @RequestParam("endTime") String endTime) { return R.ok(xskhDisciplineRecordService.getMaxScoreByTypeAndPeriod(typeId, startTime, endTime)); } diff --git a/backend/ruoyi-modules/ruoyi-xskh/src/main/java/org/dromara/xskh/controller/XskhDisciplineRevokeController.java b/backend/ruoyi-modules/ruoyi-xskh/src/main/java/org/dromara/xskh/controller/XskhDisciplineRevokeController.java index 273c92cd..f9957430 100644 --- a/backend/ruoyi-modules/ruoyi-xskh/src/main/java/org/dromara/xskh/controller/XskhDisciplineRevokeController.java +++ b/backend/ruoyi-modules/ruoyi-xskh/src/main/java/org/dromara/xskh/controller/XskhDisciplineRevokeController.java @@ -63,7 +63,7 @@ public class XskhDisciplineRevokeController extends BaseController { */ // @SaCheckPermission("disciplineRevoke:disciplineRevoke:query") @GetMapping("/{id}") - public R getInfo(@NotNull(message = "主键不能为空") @PathVariable Long id) { + public R getInfo(@NotNull(message = "主键不能为空") @PathVariable("id") Long id) { return R.ok(xskhDisciplineRevokeService.queryById(id)); } @@ -97,7 +97,7 @@ public class XskhDisciplineRevokeController extends BaseController { // @SaCheckPermission("disciplineRevoke:disciplineRevoke:remove") @Log(title = "违纪处分撤销申请审批", businessType = BusinessType.DELETE) @DeleteMapping("/{ids}") - public R remove(@NotEmpty(message = "主键不能为空") @PathVariable Long[] ids) { + public R remove(@NotEmpty(message = "主键不能为空") @PathVariable("ids") Long[] ids) { return toAjax(xskhDisciplineRevokeService.deleteWithValidByIds(List.of(ids), true)); } @@ -109,7 +109,7 @@ public class XskhDisciplineRevokeController extends BaseController { // @SaCheckPermission("disciplineRevoke:student:query") @GetMapping("/byDisciplineRecord/{disciplineRecordId}") public R getByDisciplineRecordId( - @NotNull(message = "违纪记录ID不能为空") @PathVariable Long disciplineRecordId) { + @NotNull(message = "违纪记录ID不能为空") @PathVariable("disciplineRecordId") Long disciplineRecordId) { return R.ok(xskhDisciplineRevokeService.queryByDisciplineRecordId(disciplineRecordId)); } diff --git a/backend/ruoyi-modules/ruoyi-xskh/src/main/java/org/dromara/xskh/controller/XskhDisciplineTypeController.java b/backend/ruoyi-modules/ruoyi-xskh/src/main/java/org/dromara/xskh/controller/XskhDisciplineTypeController.java index ff9f3889..149d2f20 100644 --- a/backend/ruoyi-modules/ruoyi-xskh/src/main/java/org/dromara/xskh/controller/XskhDisciplineTypeController.java +++ b/backend/ruoyi-modules/ruoyi-xskh/src/main/java/org/dromara/xskh/controller/XskhDisciplineTypeController.java @@ -63,7 +63,7 @@ public class XskhDisciplineTypeController extends BaseController { */ // @SaCheckPermission("disciplineType:disciplineType:query") @GetMapping("/{id}") - public R getInfo(@NotNull(message = "主键不能为空") @PathVariable Long id) { + public R getInfo(@NotNull(message = "主键不能为空") @PathVariable("id") Long id) { return R.ok(xskhDisciplineTypeService.queryById(id)); } @@ -97,7 +97,7 @@ public class XskhDisciplineTypeController extends BaseController { // @SaCheckPermission("disciplineType:disciplineType:remove") @Log(title = "学生违纪处分类型", businessType = BusinessType.DELETE) @DeleteMapping("/{ids}") - public R remove(@NotEmpty(message = "主键不能为空") @PathVariable Long[] ids) { + public R remove(@NotEmpty(message = "主键不能为空") @PathVariable("ids") Long[] ids) { return toAjax(xskhDisciplineTypeService.deleteWithValidByIds(List.of(ids), true)); } @@ -110,8 +110,8 @@ public class XskhDisciplineTypeController extends BaseController { */ // @SaCheckPermission("disciplineType:disciplineType:list") @GetMapping("/listByAreaType") - public R> listByAreaType(@RequestParam String areaType, - @RequestParam(required = false) String status) { + public R> listByAreaType(@RequestParam("areaType") String areaType, + @RequestParam(value = "status", required = false) String status) { XskhDisciplineTypeBo bo = new XskhDisciplineTypeBo(); bo.setAreaType(areaType); if (status != null) { diff --git a/backend/ruoyi-modules/ruoyi-xskh/src/main/java/org/dromara/xskh/controller/XskhRewardRecordController.java b/backend/ruoyi-modules/ruoyi-xskh/src/main/java/org/dromara/xskh/controller/XskhRewardRecordController.java index 32663bb7..95ef530e 100644 --- a/backend/ruoyi-modules/ruoyi-xskh/src/main/java/org/dromara/xskh/controller/XskhRewardRecordController.java +++ b/backend/ruoyi-modules/ruoyi-xskh/src/main/java/org/dromara/xskh/controller/XskhRewardRecordController.java @@ -64,7 +64,7 @@ public class XskhRewardRecordController extends BaseController { */ // @SaCheckPermission("rewardRecord:rewardRecord:query") @GetMapping("/{id}") - public R getInfo(@NotNull(message = "主键不能为空") @PathVariable Long id) { + public R getInfo(@NotNull(message = "主键不能为空") @PathVariable("id") Long id) { return R.ok(xskhRewardRecordService.queryById(id)); } @@ -98,7 +98,7 @@ public class XskhRewardRecordController extends BaseController { // @SaCheckPermission("rewardRecord:rewardRecord:remove") @Log(title = "学生奖励记录", businessType = BusinessType.DELETE) @DeleteMapping("/{ids}") - public R remove(@NotEmpty(message = "主键不能为空") @PathVariable Long[] ids) { + public R remove(@NotEmpty(message = "主键不能为空") @PathVariable("ids") Long[] ids) { return toAjax(xskhRewardRecordService.deleteWithValidByIds(List.of(ids), true)); } @@ -107,7 +107,7 @@ public class XskhRewardRecordController extends BaseController { */ // @SaCheckPermission("rewardRecord:rewardRecord:query") @GetMapping("/studentOptions") - public R> getStudentOptions(@RequestParam(required = false) String keyword) { + public R> getStudentOptions(@RequestParam(value = "keyword", required = false) String keyword) { return R.ok(xskhRewardRecordService.getStudentOptions(keyword)); } @@ -137,10 +137,10 @@ public class XskhRewardRecordController extends BaseController { // @SaCheckPermission("rewardRecord:rewardRecord:query") @GetMapping("/getStudentRewardRecords") public R> getStudentRewardRecords( - @RequestParam Long studentId, - @RequestParam String rewardTypeIds, - @RequestParam String startTime, - @RequestParam String endTime) { + @RequestParam("studentId") Long studentId, + @RequestParam("rewardTypeIds") String rewardTypeIds, + @RequestParam("startTime") String startTime, + @RequestParam("endTime") String endTime) { return R.ok(xskhRewardRecordService.getStudentRewardRecords(studentId, rewardTypeIds, startTime, endTime)); } @@ -150,9 +150,9 @@ public class XskhRewardRecordController extends BaseController { // @SaCheckPermission("rewardRecord:rewardRecord:query") @GetMapping("/getMaxScoreByTypeAndPeriod/{typeId}") public R getMaxScoreByTypeAndPeriod( - @NotNull(message = "奖励类型ID不能为空") @PathVariable Long typeId, - @RequestParam String startTime, - @RequestParam String endTime) { + @NotNull(message = "奖励类型ID不能为空") @PathVariable("typeId") Long typeId, + @RequestParam("startTime") String startTime, + @RequestParam("endTime") String endTime) { return R.ok(xskhRewardRecordService.getMaxScoreByTypeAndPeriod(typeId, startTime, endTime)); } } diff --git a/backend/ruoyi-modules/ruoyi-xskh/src/main/java/org/dromara/xskh/controller/XskhRewardTypeController.java b/backend/ruoyi-modules/ruoyi-xskh/src/main/java/org/dromara/xskh/controller/XskhRewardTypeController.java index ad5a52b1..40ef1039 100644 --- a/backend/ruoyi-modules/ruoyi-xskh/src/main/java/org/dromara/xskh/controller/XskhRewardTypeController.java +++ b/backend/ruoyi-modules/ruoyi-xskh/src/main/java/org/dromara/xskh/controller/XskhRewardTypeController.java @@ -64,7 +64,7 @@ public class XskhRewardTypeController extends BaseController { // @SaCheckPermission("rewardType:rewardType:query") @GetMapping("/{id}") public R getInfo(@NotNull(message = "主键不能为空") - @PathVariable Long id) { + @PathVariable("id") Long id) { return R.ok(xskhRewardTypeService.queryById(id)); } @@ -99,7 +99,7 @@ public class XskhRewardTypeController extends BaseController { @Log(title = "学生奖励类型", businessType = BusinessType.DELETE) @DeleteMapping("/{ids}") public R remove(@NotEmpty(message = "主键不能为空") - @PathVariable Long[] ids) { + @PathVariable("ids") Long[] ids) { return toAjax(xskhRewardTypeService.deleteWithValidByIds(List.of(ids), true)); } } diff --git a/backend/ruoyi-modules/ruoyi-zsjy/src/main/java/org/dromara/zsjy/controller/InternshipInfoController.java b/backend/ruoyi-modules/ruoyi-zsjy/src/main/java/org/dromara/zsjy/controller/InternshipInfoController.java index b0e128da..246b4acb 100644 --- a/backend/ruoyi-modules/ruoyi-zsjy/src/main/java/org/dromara/zsjy/controller/InternshipInfoController.java +++ b/backend/ruoyi-modules/ruoyi-zsjy/src/main/java/org/dromara/zsjy/controller/InternshipInfoController.java @@ -69,7 +69,7 @@ public class InternshipInfoController extends BaseController { @GetMapping("/{studentId}") public R getInfo( @Parameter(description = "学生ID", required = true) - @PathVariable Long studentId) { + @PathVariable("studentId") Long studentId) { return R.ok(internshipInfoService.queryById(studentId)); } @@ -187,7 +187,7 @@ public class InternshipInfoController extends BaseController { // @SaCheckPermission("zsjy:internship:remove") @DeleteMapping("/{internshipIds}") public R remove(@Parameter(description = "实习信息ID串") - @PathVariable Long[] internshipIds) { + @PathVariable("internshipIds") Long[] internshipIds) { log.info("删除实习信息请求,IDs:{}", (Object) internshipIds); try { Boolean result = internshipInfoService.deleteInternshipInfo(internshipIds); diff --git a/backend/ruoyi-modules/ruoyi-zsjy/src/main/java/org/dromara/zsjy/controller/ZsjyEnrollmentInfoController.java b/backend/ruoyi-modules/ruoyi-zsjy/src/main/java/org/dromara/zsjy/controller/ZsjyEnrollmentInfoController.java index f7c1cae8..8ec995be 100644 --- a/backend/ruoyi-modules/ruoyi-zsjy/src/main/java/org/dromara/zsjy/controller/ZsjyEnrollmentInfoController.java +++ b/backend/ruoyi-modules/ruoyi-zsjy/src/main/java/org/dromara/zsjy/controller/ZsjyEnrollmentInfoController.java @@ -66,7 +66,7 @@ public class ZsjyEnrollmentInfoController extends BaseController { */ // @SaCheckPermission("zsjy:enrollment:info:query") @GetMapping("/{id}") - public R getInfo(@NotNull(message = "主键不能为空") @PathVariable Long id) { + public R getInfo(@NotNull(message = "主键不能为空") @PathVariable("id") Long id) { return R.ok(enrollmentInfoService.queryById(id)); } @@ -98,7 +98,7 @@ public class ZsjyEnrollmentInfoController extends BaseController { // @SaCheckPermission("zsjy:enrollment:info:remove") @Log(title = "招生报名信息", businessType = BusinessType.DELETE) @DeleteMapping("/{ids}") - public R remove(@NotEmpty(message = "主键不能为空") @PathVariable Long[] ids) { + public R remove(@NotEmpty(message = "主键不能为空") @PathVariable("ids") Long[] ids) { return toAjax(enrollmentInfoService.deleteWithValidByIds(List.of(ids), true)); } @@ -108,8 +108,8 @@ public class ZsjyEnrollmentInfoController extends BaseController { @SaIgnore @GetMapping("/query") public R queryByIdCardAndExamNumber( - @RequestParam(required = false) String idCard, - @RequestParam(required = false) String examNumber) { + @RequestParam(value = "idCard", required = false) String idCard, + @RequestParam(value = "examNumber", required = false) String examNumber) { ZsjyEnrollmentInfoVo vo = enrollmentInfoService.queryByIdCardAndExamNumber(idCard, examNumber); return R.ok(vo); } @@ -131,8 +131,8 @@ public class ZsjyEnrollmentInfoController extends BaseController { @SaIgnore @GetMapping("/myStatus") public R getMyEnrollmentStatus( - @RequestParam String idCard, - @RequestParam String examNumber) { + @RequestParam("idCard") String idCard, + @RequestParam("examNumber") String examNumber) { ZsjyEnrollmentInfoVo vo = enrollmentInfoService.queryByIdCardAndExamNumber(idCard, examNumber); if (vo == null) { return R.fail("未找到相关报名信息"); @@ -178,7 +178,7 @@ public class ZsjyEnrollmentInfoController extends BaseController { */ @SaIgnore @GetMapping("/majors/{collegeId}") - public R> getMajorsByCollegeId(@PathVariable Long collegeId) { + public R> getMajorsByCollegeId(@PathVariable("collegeId") Long collegeId) { try { List majors = enrollmentMajorService.selectOpenMajorsByCollegeId(collegeId); return R.ok(majors); diff --git a/backend/ruoyi-modules/ruoyi-zsjy/src/main/java/org/dromara/zsjy/controller/ZsjyEnrollmentMajorController.java b/backend/ruoyi-modules/ruoyi-zsjy/src/main/java/org/dromara/zsjy/controller/ZsjyEnrollmentMajorController.java index 2443052f..0dc90016 100644 --- a/backend/ruoyi-modules/ruoyi-zsjy/src/main/java/org/dromara/zsjy/controller/ZsjyEnrollmentMajorController.java +++ b/backend/ruoyi-modules/ruoyi-zsjy/src/main/java/org/dromara/zsjy/controller/ZsjyEnrollmentMajorController.java @@ -40,7 +40,7 @@ public class ZsjyEnrollmentMajorController extends BaseController { @SaCheckPermission(value = {"zsjy:enrollmentMajor:list", "zsjy:enrollmentMajor:query"}, mode = SaMode.OR) @GetMapping("/list") - public R> list(@RequestParam Long collegeDeptId) { + public R> list(@RequestParam("collegeDeptId") Long collegeDeptId) { return R.ok(enrollmentMajorService.selectMajorConfigByCollegeId(collegeDeptId)); } diff --git a/backend/ruoyi-modules/ruoyi-zsjy/src/main/java/org/dromara/zsjy/controller/ZsjyEnrollmentProcessController.java b/backend/ruoyi-modules/ruoyi-zsjy/src/main/java/org/dromara/zsjy/controller/ZsjyEnrollmentProcessController.java index 7cb0d3bc..0fd02b5a 100644 --- a/backend/ruoyi-modules/ruoyi-zsjy/src/main/java/org/dromara/zsjy/controller/ZsjyEnrollmentProcessController.java +++ b/backend/ruoyi-modules/ruoyi-zsjy/src/main/java/org/dromara/zsjy/controller/ZsjyEnrollmentProcessController.java @@ -75,7 +75,7 @@ public class ZsjyEnrollmentProcessController extends BaseController { */ // @SaCheckPermission("zsjy:enrollment:process:query") @GetMapping("/{id}") - public R getInfo(@NotNull(message = "主键不能为空") @PathVariable Long id) { + public R getInfo(@NotNull(message = "主键不能为空") @PathVariable("id") Long id) { return R.ok(enrollmentProcessService.queryById(id)); } @@ -84,7 +84,7 @@ public class ZsjyEnrollmentProcessController extends BaseController { */ // @SaCheckPermission("zsjy:enrollment:process:query") @GetMapping("/enrollment/{enrollmentId}") - public R getByEnrollmentId(@NotNull(message = "报名信息ID不能为空") @PathVariable Long enrollmentId) { + public R getByEnrollmentId(@NotNull(message = "报名信息ID不能为空") @PathVariable("enrollmentId") Long enrollmentId) { return R.ok(enrollmentProcessService.queryByEnrollmentId(enrollmentId)); } @@ -116,7 +116,7 @@ public class ZsjyEnrollmentProcessController extends BaseController { // @SaCheckPermission("zsjy:enrollment:process:remove") @Log(title = "招生录取流程状态", businessType = BusinessType.DELETE) @DeleteMapping("/{ids}") - public R remove(@NotEmpty(message = "主键不能为空") @PathVariable Long[] ids) { + public R remove(@NotEmpty(message = "主键不能为空") @PathVariable("ids") Long[] ids) { return toAjax(enrollmentProcessService.deleteWithValidByIds(List.of(ids), true)); } @@ -126,7 +126,7 @@ public class ZsjyEnrollmentProcessController extends BaseController { // @SaCheckPermission("zsjy:enrollment:process:init") @Log(title = "初始化招生录取流程", businessType = BusinessType.INSERT) @PostMapping("/init") - public R initProcess(@RequestParam Long enrollmentId, @RequestParam String studentName, @RequestParam String idCard) { + public R initProcess(@RequestParam("enrollmentId") Long enrollmentId, @RequestParam("studentName") String studentName, @RequestParam("idCard") String idCard) { return toAjax(enrollmentProcessService.initProcess(enrollmentId, studentName, idCard)); } @@ -136,7 +136,7 @@ public class ZsjyEnrollmentProcessController extends BaseController { // @SaCheckPermission("zsjy:enrollment:process:audit") @Log(title = "招生信息审核", businessType = BusinessType.UPDATE) @PostMapping("/infoAudit") - public R infoAudit(@RequestParam Long processId, @RequestParam String auditResult, @RequestParam(required = false) String auditOpinion) { + public R infoAudit(@RequestParam("processId") Long processId, @RequestParam("auditResult") String auditResult, @RequestParam(value = "auditOpinion", required = false) String auditOpinion) { return toAjax(enrollmentProcessService.infoAudit(processId, auditResult, auditOpinion)); } @@ -146,9 +146,9 @@ public class ZsjyEnrollmentProcessController extends BaseController { // @SaCheckPermission("zsjy:enrollment:process:admission") @Log(title = "招生录取处理", businessType = BusinessType.UPDATE) @PostMapping("/admissionProcess") - public R admissionProcess(@RequestParam Long processId, @RequestParam String admissionResult, - @RequestParam(required = false) String admissionOpinion, - @RequestParam(required = false) String noticeNumber) { + public R admissionProcess(@RequestParam("processId") Long processId, @RequestParam("admissionResult") String admissionResult, + @RequestParam(value = "admissionOpinion", required = false) String admissionOpinion, + @RequestParam(value = "noticeNumber", required = false) String noticeNumber) { return toAjax(enrollmentProcessService.admissionProcess(processId, admissionResult, admissionOpinion, noticeNumber)); } @@ -176,7 +176,7 @@ public class ZsjyEnrollmentProcessController extends BaseController { // @SaCheckPermission("zsjy:enrollment:process:final") @Log(title = "招生最终确认", businessType = BusinessType.UPDATE) @PostMapping("/finalConfirm") - public R finalConfirm(@RequestParam Long processId, @RequestParam String finalResult, @RequestParam(required = false) String finalOpinion) { + public R finalConfirm(@RequestParam("processId") Long processId, @RequestParam("finalResult") String finalResult, @RequestParam(value = "finalOpinion", required = false) String finalOpinion) { return toAjax(enrollmentProcessService.finalConfirm(processId, finalResult, finalOpinion)); } @@ -186,7 +186,7 @@ public class ZsjyEnrollmentProcessController extends BaseController { // @SaCheckPermission("zsjy:enrollment:process:add") @Log(title = "创建录取流程", businessType = BusinessType.INSERT) @PostMapping("/createFromEnrollment") - public R createFromEnrollment(@RequestParam Long enrollmentId) { + public R createFromEnrollment(@RequestParam("enrollmentId") Long enrollmentId) { return toAjax(enrollmentProcessService.initProcess(enrollmentId)); } @@ -196,7 +196,7 @@ public class ZsjyEnrollmentProcessController extends BaseController { // @SaCheckPermission("zsjy:enrollment:process:edit") @Log(title = "同步流程状态", businessType = BusinessType.UPDATE) @PostMapping("/syncStatus") - public R syncStatus(@RequestParam Long id) { + public R syncStatus(@RequestParam("id") Long id) { // 这里可以实现状态同步逻辑,暂时返回成功 return R.ok(); } @@ -216,7 +216,7 @@ public class ZsjyEnrollmentProcessController extends BaseController { */ // @SaCheckPermission("zsjy:enrollment:process:query") @GetMapping("/status/{status}") - public TableDataInfo getListByStatus(@PathVariable String status, ZsjyEnrollmentProcessBo bo, PageQuery pageQuery) { + public TableDataInfo getListByStatus(@PathVariable("status") String status, ZsjyEnrollmentProcessBo bo, PageQuery pageQuery) { bo.setCurrentStatus(status); return enrollmentProcessService.queryPageList(bo, pageQuery); } @@ -226,7 +226,7 @@ public class ZsjyEnrollmentProcessController extends BaseController { */ // @SaCheckPermission("zsjy:enrollment:process:query") @GetMapping("/search") - public TableDataInfo searchProcess(@RequestParam String keyword, ZsjyEnrollmentProcessBo bo, PageQuery pageQuery) { + public TableDataInfo searchProcess(@RequestParam("keyword") String keyword, ZsjyEnrollmentProcessBo bo, PageQuery pageQuery) { bo.setStudentName(keyword); // 按学生姓名搜索 return enrollmentProcessService.queryPageList(bo, pageQuery); } @@ -237,7 +237,7 @@ public class ZsjyEnrollmentProcessController extends BaseController { // @SaCheckPermission("zsjy:enrollment:process:edit") @Log(title = "确认缴费", businessType = BusinessType.UPDATE) @PostMapping("/confirmPayment") - public R confirmPayment(@RequestParam Long processId) { + public R confirmPayment(@RequestParam("processId") Long processId) { // 实现缴费确认逻辑 ZsjyEnrollmentProcessBo bo = new ZsjyEnrollmentProcessBo(); bo.setId(processId); @@ -252,7 +252,7 @@ public class ZsjyEnrollmentProcessController extends BaseController { // @SaCheckPermission("zsjy:enrollment:process:edit") @Log(title = "完成录取流程", businessType = BusinessType.UPDATE) @PostMapping("/complete") - public R completeProcess(@RequestParam Long processId) { + public R completeProcess(@RequestParam("processId") Long processId) { ZsjyEnrollmentProcessBo bo = new ZsjyEnrollmentProcessBo(); bo.setId(processId); bo.setCurrentStatus("4"); // 录取完成 @@ -266,7 +266,7 @@ public class ZsjyEnrollmentProcessController extends BaseController { // @SaCheckPermission("zsjy:enrollment:process:edit") @Log(title = "驳回录取流程", businessType = BusinessType.UPDATE) @PostMapping("/reject") - public R rejectProcess(@RequestParam Long processId, @RequestParam String rejectReason) { + public R rejectProcess(@RequestParam("processId") Long processId, @RequestParam("rejectReason") String rejectReason) { ZsjyEnrollmentProcessBo bo = new ZsjyEnrollmentProcessBo(); bo.setId(processId); bo.setCurrentStatus("9"); // 已驳回 @@ -280,7 +280,7 @@ public class ZsjyEnrollmentProcessController extends BaseController { // @SaCheckPermission("zsjy:enrollment:process:edit") @Log(title = "重置录取流程", businessType = BusinessType.UPDATE) @PostMapping("/reset") - public R resetProcess(@RequestParam Long processId) { + public R resetProcess(@RequestParam("processId") Long processId) { ZsjyEnrollmentProcessBo bo = new ZsjyEnrollmentProcessBo(); bo.setId(processId); bo.setCurrentStatus("0"); // 重置为待审核 diff --git a/backend/ruoyi-modules/ruoyi-zsjy/src/main/java/org/dromara/zsjy/controller/ZsjyEnterpriseController.java b/backend/ruoyi-modules/ruoyi-zsjy/src/main/java/org/dromara/zsjy/controller/ZsjyEnterpriseController.java index 959563a2..dca64f37 100644 --- a/backend/ruoyi-modules/ruoyi-zsjy/src/main/java/org/dromara/zsjy/controller/ZsjyEnterpriseController.java +++ b/backend/ruoyi-modules/ruoyi-zsjy/src/main/java/org/dromara/zsjy/controller/ZsjyEnterpriseController.java @@ -75,7 +75,7 @@ public class ZsjyEnterpriseController extends BaseController { */ @SaCheckPermission("zsjy:enterprise:query") @GetMapping("/{id}") - public R getInfo(@PathVariable Long id) { + public R getInfo(@PathVariable("id") Long id) { return R.ok(enterpriseService.queryWithJobs(id)); } @@ -107,7 +107,7 @@ public class ZsjyEnterpriseController extends BaseController { @Log(title = "企业信息", businessType = BusinessType.DELETE) @SaCheckPermission("zsjy:enterprise:remove") @DeleteMapping("/{ids}") - public R remove(@PathVariable Long[] ids) { + public R remove(@PathVariable("ids") Long[] ids) { return toAjax(enterpriseService.deleteWithValidByIds(Arrays.asList(ids), true)); } @@ -147,7 +147,7 @@ public class ZsjyEnterpriseController extends BaseController { */ @SaCheckPermission("zsjy:enterprise:brochure") @GetMapping("/brochure/download/{enterpriseId}") - public void downloadBrochure(@PathVariable Long enterpriseId, HttpServletResponse response) { + public void downloadBrochure(@PathVariable("enterpriseId") Long enterpriseId, HttpServletResponse response) { try { // 优先从简章记录获取企业名称(更可靠) ZsjyEnterpriseBrochureVo brochure = brochureService.getLatestBrochure(enterpriseId); @@ -176,7 +176,7 @@ public class ZsjyEnterpriseController extends BaseController { */ @SaCheckPermission("zsjy:enterprise:query") @GetMapping("/brochure/{enterpriseId}") - public R getBrochure(@PathVariable Long enterpriseId) { + public R getBrochure(@PathVariable("enterpriseId") Long enterpriseId) { return R.ok(brochureService.getLatestBrochure(enterpriseId)); } @@ -186,7 +186,7 @@ public class ZsjyEnterpriseController extends BaseController { @Log(title = "企业招聘简章", businessType = BusinessType.INSERT) @SaCheckPermission("zsjy:enterprise:brochure") @PostMapping("/brochure/{enterpriseId}") - public R generateBrochure(@PathVariable Long enterpriseId) { + public R generateBrochure(@PathVariable("enterpriseId") Long enterpriseId) { return R.ok(brochureService.generateBrochure(enterpriseId)); } @@ -198,7 +198,7 @@ public class ZsjyEnterpriseController extends BaseController { @Log(title = "批量生成企业招聘简章", businessType = BusinessType.INSERT) @SaCheckPermission("zsjy:enterprise:brochure") @PostMapping("/brochure/batch/{enterpriseIds}") - public R> generateBrochureBatch(@PathVariable String enterpriseIds) { + public R> generateBrochureBatch(@PathVariable("enterpriseIds") String enterpriseIds) { List ids = Arrays.stream(enterpriseIds.split(",")) .map(String::trim) .filter(s -> !s.isEmpty()) @@ -230,7 +230,7 @@ public class ZsjyEnterpriseController extends BaseController { */ @SaCheckPermission("zsjy:enterprise:brochure") @GetMapping("/brochure/downloadById/{id}") - public void downloadBrochureById(@PathVariable Long id, HttpServletResponse response) { + public void downloadBrochureById(@PathVariable("id") Long id, HttpServletResponse response) { try { brochureService.downloadPdfById(id, response); } catch (ServiceException e) { diff --git a/backend/ruoyi-modules/ruoyi-zsjy/src/main/java/org/dromara/zsjy/controller/ZsjyGraduateInfoController.java b/backend/ruoyi-modules/ruoyi-zsjy/src/main/java/org/dromara/zsjy/controller/ZsjyGraduateInfoController.java index 35a1b5d2..dc8b40cb 100644 --- a/backend/ruoyi-modules/ruoyi-zsjy/src/main/java/org/dromara/zsjy/controller/ZsjyGraduateInfoController.java +++ b/backend/ruoyi-modules/ruoyi-zsjy/src/main/java/org/dromara/zsjy/controller/ZsjyGraduateInfoController.java @@ -66,7 +66,7 @@ public class ZsjyGraduateInfoController extends BaseController { // @SaCheckPermission("zsjy:graduate:query") @GetMapping("/{id}") public R getInfo(@NotNull(message = "主键不能为空") - @PathVariable Long id) { + @PathVariable("id") Long id) { return R.ok(graduateInfoService.queryById(id)); } @@ -101,7 +101,7 @@ public class ZsjyGraduateInfoController extends BaseController { @Log(title = "毕业生信息", businessType = BusinessType.DELETE) @DeleteMapping("/{ids}") public R remove(@NotEmpty(message = "主键不能为空") - @PathVariable Long[] ids) { + @PathVariable("ids") Long[] ids) { return toAjax(graduateInfoService.deleteWithValidByIds(Arrays.asList(ids), true)); } @@ -113,7 +113,7 @@ public class ZsjyGraduateInfoController extends BaseController { // @SaCheckPermission("zsjy:graduate:query") @GetMapping("/student/{studentNo}") public R getByStudentNo(@NotBlank(message = "学号不能为空") - @PathVariable String studentNo) { + @PathVariable("studentNo") String studentNo) { return R.ok(graduateInfoService.queryByStudentNo(studentNo)); } @@ -125,7 +125,7 @@ public class ZsjyGraduateInfoController extends BaseController { // @SaCheckPermission("zsjy:graduate:query") @GetMapping("/idcard/{idCard}") public R getByIdCard(@NotBlank(message = "身份证号不能为空") - @PathVariable String idCard) { + @PathVariable("idCard") String idCard) { return R.ok(graduateInfoService.queryByIdCard(idCard)); } @@ -163,7 +163,7 @@ public class ZsjyGraduateInfoController extends BaseController { // @SaCheckPermission("zsjy:graduate:audit") @Log(title = "毕业生信息审核", businessType = BusinessType.UPDATE) @PutMapping("/audit/{id}") - public R audit(@NotNull(message = "主键不能为空") @PathVariable Long id, + public R audit(@NotNull(message = "主键不能为空") @PathVariable("id") Long id, @NotBlank(message = "审核状态不能为空") String auditStatus, String auditRemark) { return toAjax(graduateInfoService.auditById(id, auditStatus, auditRemark)); @@ -286,7 +286,7 @@ public class ZsjyGraduateInfoController extends BaseController { // @SaCheckPermission("zsjy:graduate:query") @GetMapping("/college/{collegeId}") public R> getListByCollegeId(@NotNull(message = "学院ID不能为空") - @PathVariable Long collegeId, + @PathVariable("collegeId") Long collegeId, ZsjyGraduateInfoBo bo) { return R.ok(graduateInfoService.queryListByCollegeId(collegeId, bo)); } @@ -299,7 +299,7 @@ public class ZsjyGraduateInfoController extends BaseController { // @SaCheckPermission("zsjy:graduate:query") @GetMapping("/major/{majorId}") public R> getListByMajorId(@NotNull(message = "专业ID不能为空") - @PathVariable Long majorId, + @PathVariable("majorId") Long majorId, ZsjyGraduateInfoBo bo) { return R.ok(graduateInfoService.queryListByMajorId(majorId, bo)); } @@ -312,7 +312,7 @@ public class ZsjyGraduateInfoController extends BaseController { // @SaCheckPermission("zsjy:graduate:query") @GetMapping("/class/{classId}") public R> getListByClassId(@NotNull(message = "班级ID不能为空") - @PathVariable Long classId, + @PathVariable("classId") Long classId, ZsjyGraduateInfoBo bo) { return R.ok(graduateInfoService.queryListByClassId(classId, bo)); } diff --git a/backend/ruoyi-modules/ruoyi-zsjy/src/main/java/org/dromara/zsjy/controller/ZsjyInternshipDailyController.java b/backend/ruoyi-modules/ruoyi-zsjy/src/main/java/org/dromara/zsjy/controller/ZsjyInternshipDailyController.java index fb4be95a..b3335de4 100644 --- a/backend/ruoyi-modules/ruoyi-zsjy/src/main/java/org/dromara/zsjy/controller/ZsjyInternshipDailyController.java +++ b/backend/ruoyi-modules/ruoyi-zsjy/src/main/java/org/dromara/zsjy/controller/ZsjyInternshipDailyController.java @@ -74,9 +74,9 @@ public class ZsjyInternshipDailyController extends BaseController { // @SaCheckPermission("zsjy:internshipdaily:calendar") @GetMapping("/calendar") public R>> getCalendar( - @Parameter(description = "学生ID", required = true) @RequestParam Long studentId, - @Parameter(description = "年份") @RequestParam(required = false) Integer year, - @Parameter(description = "月份") @RequestParam(required = false) Integer month) { + @Parameter(description = "学生ID", required = true) @RequestParam("studentId") Long studentId, + @Parameter(description = "年份") @RequestParam(value = "year", required = false) Integer year, + @Parameter(description = "月份") @RequestParam(value = "month", required = false) Integer month) { log.info("=== Controller层调试 ==="); log.info("接口被调用: /zsjy/internship/daily/calendar"); @@ -106,9 +106,9 @@ public class ZsjyInternshipDailyController extends BaseController { // @SaCheckPermission("zsjy:internshipdaily:statistics") @GetMapping("/monthly-statistics") public R> getStudentMonthlyStatistics( - @Parameter(description = "学生ID", required = true) @RequestParam Long studentId, - @Parameter(description = "年份", required = true) @RequestParam Integer year, - @Parameter(description = "月份", required = true) @RequestParam Integer month) { + @Parameter(description = "学生ID", required = true) @RequestParam("studentId") Long studentId, + @Parameter(description = "年份", required = true) @RequestParam("year") Integer year, + @Parameter(description = "月份", required = true) @RequestParam("month") Integer month) { log.info("=== Controller层调试 ==="); log.info("接口被调用: /zsjy/internship/daily/monthly-statistics"); diff --git a/backend/ruoyi-modules/ruoyi-zsjy/src/main/java/org/dromara/zsjy/controller/ZsjyInternshipMonthlyController.java b/backend/ruoyi-modules/ruoyi-zsjy/src/main/java/org/dromara/zsjy/controller/ZsjyInternshipMonthlyController.java index ba1eb569..dec17cb3 100644 --- a/backend/ruoyi-modules/ruoyi-zsjy/src/main/java/org/dromara/zsjy/controller/ZsjyInternshipMonthlyController.java +++ b/backend/ruoyi-modules/ruoyi-zsjy/src/main/java/org/dromara/zsjy/controller/ZsjyInternshipMonthlyController.java @@ -65,7 +65,7 @@ public class ZsjyInternshipMonthlyController extends BaseController { // @SaCheckPermission("zsjy:internshipmonthly:query") @GetMapping("/{monthlyId}") public R getInfo(@Parameter(description = "月度总结ID") - @PathVariable Long monthlyId) { + @PathVariable("monthlyId") Long monthlyId) { log.info("查询月度总结详情, ID: {}", monthlyId); return R.ok(monthlyService.queryById(monthlyId)); } @@ -107,7 +107,7 @@ public class ZsjyInternshipMonthlyController extends BaseController { // @SaCheckPermission("zsjy:internshipmonthly:remove") @DeleteMapping("/{monthlyIds}") public R remove(@Parameter(description = "月度总结ID串") - @PathVariable Long[] monthlyIds) { + @PathVariable("monthlyIds") Long[] monthlyIds) { log.info("删除月度总结, IDs: {}", (Object) monthlyIds); if (!monthlyService.deleteByIds(List.of(monthlyIds))) { @@ -123,7 +123,7 @@ public class ZsjyInternshipMonthlyController extends BaseController { // @SaCheckPermission("zsjy:internshipmonthly:submit") @PutMapping("/submit/{monthlyId}") public R submit(@Parameter(description = "月度总结ID") - @PathVariable Long monthlyId) { + @PathVariable("monthlyId") Long monthlyId) { log.info("提交月度总结审批, ID: {}", monthlyId); if (!monthlyService.submitForApproval(monthlyId)) { @@ -154,9 +154,9 @@ public class ZsjyInternshipMonthlyController extends BaseController { // @SaCheckPermission("zsjy:internshipmonthly:check") @GetMapping("/check/{summaryMonth}") public R checkMonth(@Parameter(description = "总结月份") - @PathVariable String summaryMonth, + @PathVariable("summaryMonth") String summaryMonth, @Parameter(description = "排除的总结ID") - @RequestParam(required = false) Long monthlyId) { + @RequestParam(value = "monthlyId", required = false) Long monthlyId) { log.info("检查月份总结, 月份: {}, 排除ID: {}", summaryMonth, monthlyId); Boolean exists = monthlyService.checkMonthExists(null, summaryMonth, monthlyId); @@ -170,7 +170,7 @@ public class ZsjyInternshipMonthlyController extends BaseController { // @SaCheckPermission("zsjy:internshipmonthly:template") @GetMapping("/template/{summaryMonth}") public R getTemplate(@Parameter(description = "总结月份") - @PathVariable String summaryMonth) { + @PathVariable("summaryMonth") String summaryMonth) { log.info("获取月度总结模板, 月份: {}", summaryMonth); ZsjyInternshipMonthlyVo template = monthlyService.getMonthlyTemplate(summaryMonth); @@ -184,7 +184,7 @@ public class ZsjyInternshipMonthlyController extends BaseController { // @SaCheckPermission("zsjy:internshipmonthly:list") @GetMapping("/internship/{internshipId}") public R> listByInternship(@Parameter(description = "实习ID") - @PathVariable Long internshipId) { + @PathVariable("internshipId") Long internshipId) { log.info("查询实习月度总结列表, 实习ID: {}", internshipId); List list = monthlyService.queryByStudentAndInternship(null, internshipId); diff --git a/backend/ruoyi-modules/ruoyi-zsjy/src/main/java/org/dromara/zsjy/controller/ZsjyInternshipMonthlyReviewController.java b/backend/ruoyi-modules/ruoyi-zsjy/src/main/java/org/dromara/zsjy/controller/ZsjyInternshipMonthlyReviewController.java index cbcbb761..84e978da 100644 --- a/backend/ruoyi-modules/ruoyi-zsjy/src/main/java/org/dromara/zsjy/controller/ZsjyInternshipMonthlyReviewController.java +++ b/backend/ruoyi-modules/ruoyi-zsjy/src/main/java/org/dromara/zsjy/controller/ZsjyInternshipMonthlyReviewController.java @@ -80,7 +80,7 @@ public class ZsjyInternshipMonthlyReviewController extends BaseController { // @SaCheckPermission("zsjy:internshipmonthly:review") @GetMapping("/{monthlyId}/detail") public R getReviewDetail(@Parameter(description = "月度总结ID") - @PathVariable Long monthlyId) { + @PathVariable("monthlyId") Long monthlyId) { log.info("查询月度总结审核详情, ID: {}", monthlyId); return R.ok(reviewService.queryReviewDetail(monthlyId)); } diff --git a/backend/ruoyi-modules/ruoyi-zsjy/src/main/java/org/dromara/zsjy/controller/ZsjyInternshipVisitController.java b/backend/ruoyi-modules/ruoyi-zsjy/src/main/java/org/dromara/zsjy/controller/ZsjyInternshipVisitController.java index 43942150..f8854699 100644 --- a/backend/ruoyi-modules/ruoyi-zsjy/src/main/java/org/dromara/zsjy/controller/ZsjyInternshipVisitController.java +++ b/backend/ruoyi-modules/ruoyi-zsjy/src/main/java/org/dromara/zsjy/controller/ZsjyInternshipVisitController.java @@ -75,7 +75,7 @@ public class ZsjyInternshipVisitController extends BaseController { @Parameter(name = "visitId", description = "走访记录ID", required = true) }) public R getInfo(@NotNull(message = "走访记录ID不能为空") - @PathVariable Long visitId) { + @PathVariable("visitId") Long visitId) { return R.ok(zsjyInternshipVisitService.queryById(visitId)); } @@ -114,7 +114,7 @@ public class ZsjyInternshipVisitController extends BaseController { @Parameter(name = "visitIds", description = "走访记录ID串", required = true) }) public R remove(@NotEmpty(message = "走访记录ID不能为空") - @PathVariable Long[] visitIds) { + @PathVariable("visitIds") Long[] visitIds) { return toAjax(zsjyInternshipVisitService.deleteWithValidByIds(List.of(visitIds), true)); } diff --git a/backend/ruoyi-modules/ruoyi-zsjy/src/main/java/org/dromara/zsjy/controller/ZsjyJobPositionController.java b/backend/ruoyi-modules/ruoyi-zsjy/src/main/java/org/dromara/zsjy/controller/ZsjyJobPositionController.java index 75ee4ea3..ef01240a 100644 --- a/backend/ruoyi-modules/ruoyi-zsjy/src/main/java/org/dromara/zsjy/controller/ZsjyJobPositionController.java +++ b/backend/ruoyi-modules/ruoyi-zsjy/src/main/java/org/dromara/zsjy/controller/ZsjyJobPositionController.java @@ -64,7 +64,7 @@ public class ZsjyJobPositionController extends BaseController { */ // @SaCheckPermission("zsjy:position:query") @GetMapping("/{id}") - public R getInfo(@NotNull(message = "主键不能为空") @PathVariable Long id) { + public R getInfo(@NotNull(message = "主键不能为空") @PathVariable("id") Long id) { return R.ok(jobPositionService.queryById(id)); } @@ -98,7 +98,7 @@ public class ZsjyJobPositionController extends BaseController { // @SaCheckPermission("zsjy:position:remove") @Log(title = "招聘岗位", businessType = BusinessType.DELETE) @DeleteMapping("/{ids}") - public R remove(@NotEmpty(message = "主键不能为空") @PathVariable Long[] ids) { + public R remove(@NotEmpty(message = "主键不能为空") @PathVariable("ids") Long[] ids) { return toAjax(jobPositionService.deleteWithValidByIds(Arrays.asList(ids), true)); } @@ -107,7 +107,7 @@ public class ZsjyJobPositionController extends BaseController { */ // @SaCheckPermission("zsjy:position:list") @GetMapping("/enterprise/{enterpriseId}") - public R> listByEnterpriseId(@NotNull(message = "企业ID不能为空") @PathVariable Long enterpriseId) { + public R> listByEnterpriseId(@NotNull(message = "企业ID不能为空") @PathVariable("enterpriseId") Long enterpriseId) { return R.ok(jobPositionService.queryListByEnterpriseId(enterpriseId)); } @@ -116,7 +116,7 @@ public class ZsjyJobPositionController extends BaseController { */ // @SaCheckPermission("zsjy:position:list") @GetMapping("/options") - public R> getOptions(@RequestParam(required = false) Long enterpriseId) { + public R> getOptions(@RequestParam(value = "enterpriseId", required = false) Long enterpriseId) { ZsjyJobPositionBo bo = new ZsjyJobPositionBo(); if (enterpriseId != null) { bo.setEnterpriseId(enterpriseId); diff --git a/backend/ruoyi-modules/ruoyi-zsjy/src/main/java/org/dromara/zsjy/controller/ZsjyQrCodeController.java b/backend/ruoyi-modules/ruoyi-zsjy/src/main/java/org/dromara/zsjy/controller/ZsjyQrCodeController.java index 76d3c201..930b0a3e 100644 --- a/backend/ruoyi-modules/ruoyi-zsjy/src/main/java/org/dromara/zsjy/controller/ZsjyQrCodeController.java +++ b/backend/ruoyi-modules/ruoyi-zsjy/src/main/java/org/dromara/zsjy/controller/ZsjyQrCodeController.java @@ -122,7 +122,7 @@ public class ZsjyQrCodeController extends BaseController { @GetMapping("/validate/{token}") public R validateToken( @Parameter(description = "访问令牌", required = true) - @PathVariable String token) { + @PathVariable("token") String token) { return R.ok(qrCodeService.validateToken(token)); } @@ -133,7 +133,7 @@ public class ZsjyQrCodeController extends BaseController { @GetMapping("/token/{token}") public R getByToken( @Parameter(description = "访问令牌", required = true) - @PathVariable String token) { + @PathVariable("token") String token) { return R.ok(qrCodeService.queryByAccessToken(token)); } diff --git a/backend/ruoyi-modules/ruoyi-zsjy/src/main/java/org/dromara/zsjy/controller/ZsjyRecruitmentPosterController.java b/backend/ruoyi-modules/ruoyi-zsjy/src/main/java/org/dromara/zsjy/controller/ZsjyRecruitmentPosterController.java index b52d4003..312eb7ae 100644 --- a/backend/ruoyi-modules/ruoyi-zsjy/src/main/java/org/dromara/zsjy/controller/ZsjyRecruitmentPosterController.java +++ b/backend/ruoyi-modules/ruoyi-zsjy/src/main/java/org/dromara/zsjy/controller/ZsjyRecruitmentPosterController.java @@ -62,7 +62,7 @@ public class ZsjyRecruitmentPosterController extends BaseController { */ // @SaCheckPermission("zsjy:poster:query") @GetMapping("/{id}") - public R getInfo(@NotNull(message = "主键不能为空") @PathVariable Long id) { + public R getInfo(@NotNull(message = "主键不能为空") @PathVariable("id") Long id) { return R.ok(recruitmentPosterService.queryById(id)); } @@ -100,7 +100,7 @@ public class ZsjyRecruitmentPosterController extends BaseController { // @SaCheckPermission("zsjy:poster:remove") @Log(title = "招聘海报", businessType = BusinessType.DELETE) @DeleteMapping("/{ids}") - public R remove(@NotEmpty(message = "主键不能为空") @PathVariable Long[] ids) { + public R remove(@NotEmpty(message = "主键不能为空") @PathVariable("ids") Long[] ids) { return toAjax(recruitmentPosterService.deleteWithValidByIds(Arrays.asList(ids), true)); } @@ -111,7 +111,7 @@ public class ZsjyRecruitmentPosterController extends BaseController { @Log(title = "企业招聘海报", businessType = BusinessType.INSERT) @RepeatSubmit() @PostMapping("/enterprise/{enterpriseId}") - public R generateEnterprisePoster(@NotNull(message = "企业ID不能为空") @PathVariable Long enterpriseId) { + public R generateEnterprisePoster(@NotNull(message = "企业ID不能为空") @PathVariable("enterpriseId") Long enterpriseId) { return R.ok(recruitmentPosterService.generateEnterprisePoster(enterpriseId)); } @@ -122,7 +122,7 @@ public class ZsjyRecruitmentPosterController extends BaseController { @Log(title = "岗位招聘海报", businessType = BusinessType.INSERT) @RepeatSubmit() @PostMapping("/position/{positionId}") - public R generatePositionPoster(@NotNull(message = "岗位ID不能为空") @PathVariable Long positionId) { + public R generatePositionPoster(@NotNull(message = "岗位ID不能为空") @PathVariable("positionId") Long positionId) { return R.ok(recruitmentPosterService.generatePositionPoster(positionId)); } @@ -132,7 +132,7 @@ public class ZsjyRecruitmentPosterController extends BaseController { // @SaCheckPermission("zsjy:poster:export") @Log(title = "导出海报图片", businessType = BusinessType.EXPORT) @GetMapping("/export/image/{id}") - public void exportImage(@NotNull(message = "海报ID不能为空") @PathVariable Long id, HttpServletResponse response) { + public void exportImage(@NotNull(message = "海报ID不能为空") @PathVariable("id") Long id, HttpServletResponse response) { ZsjyRecruitmentPosterVo poster = recruitmentPosterService.queryById(id); // 导出图片逻辑需要在实际实现中处理 // 此处省略具体实现 @@ -144,7 +144,7 @@ public class ZsjyRecruitmentPosterController extends BaseController { // @SaCheckPermission("zsjy:poster:export") @Log(title = "导出海报PDF", businessType = BusinessType.EXPORT) @GetMapping("/export/pdf/{id}") - public void exportPdf(@NotNull(message = "海报ID不能为空") @PathVariable Long id, HttpServletResponse response) { + public void exportPdf(@NotNull(message = "海报ID不能为空") @PathVariable("id") Long id, HttpServletResponse response) { ZsjyRecruitmentPosterVo poster = recruitmentPosterService.queryById(id); // 导出PDF逻辑需要在实际实现中处理 // 此处省略具体实现 diff --git a/backend/ruoyi-modules/ruoyi-zsjy/src/main/java/org/dromara/zsjy/controller/ZsjyStatisticsController.java b/backend/ruoyi-modules/ruoyi-zsjy/src/main/java/org/dromara/zsjy/controller/ZsjyStatisticsController.java index 5d740864..8345d1e2 100644 --- a/backend/ruoyi-modules/ruoyi-zsjy/src/main/java/org/dromara/zsjy/controller/ZsjyStatisticsController.java +++ b/backend/ruoyi-modules/ruoyi-zsjy/src/main/java/org/dromara/zsjy/controller/ZsjyStatisticsController.java @@ -82,7 +82,7 @@ public class ZsjyStatisticsController extends BaseController { */ // @SaCheckPermission("zsjy:statistics:view") @GetMapping("/trend") - public R> getEnrollmentTrend(@RequestParam(required = false) Integer days) { + public R> getEnrollmentTrend(@RequestParam(value = "days", required = false) Integer days) { log.info("接收到获取报名趋势统计请求, days={}", days); Map result = statisticsService.getEnrollmentTrend(days); log.info("报名趋势统计响应: {}", result != null ? "数据获取成功" : "数据为空"); diff --git a/docs/部署文档/杭州第一技师部署文档/多实例部署说明.md b/docs/部署文档/杭州第一技师部署文档/多实例部署说明.md index 09af58de..c56a8729 100644 --- a/docs/部署文档/杭州第一技师部署文档/多实例部署说明.md +++ b/docs/部署文档/杭州第一技师部署文档/多实例部署说明.md @@ -43,13 +43,23 @@ backend/ # 进入backend目录 cd backend -# 编译生产环境JAR包 -mvn clean package -Pprod +# 编译生产环境JAR包(推荐命令) +# -Pprod:启用生产配置 +# -Dmaven.compiler.parameters=true:强制保留方法参数名(与父 POM 双保险) +mvn clean package -Pprod -Dmaven.compiler.parameters=true + +# 等价简写(父 POM 已默认开启 maven.compiler.parameters=true,也可直接用): +# mvn clean package -Pprod # 检查生成的JAR文件 ls -la ruoyi-admin/target/ruoyi-admin.jar ``` +> **说明**:若编译未保留参数名,生产环境可能出现 +> `Name for argument of type [java.lang.Long] not specified...`。 +> 父 POM 已配置 `true` 与 `-parameters`, +> 推荐命令再显式传一次 `-Dmaven.compiler.parameters=true`,避免被外部环境覆盖。 + ### 2. 准备部署文件 ```bash diff --git a/mobile/.env.production b/mobile/.env.production index 3cdd4c45..66d370f9 100644 --- a/mobile/.env.production +++ b/mobile/.env.production @@ -8,13 +8,15 @@ NODE_ENV=production VUE_APP_API_BASE_URL=/prod-api # 如果生产环境需要直接访问完整URL,请修改为: # VUE_APP_API_BASE_URL=https://api.example.com -VUE_APP_DEV_SERVER_URL=https://m.hzdyjsxy.cn:18080 +#VUE_APP_DEV_SERVER_URL=https://m.hzdyjsxy.cn:18080 +VUE_APP_DEV_SERVER_URL=http://m.hzdyjsxy.cn:18080 VUE_APP_REQUEST_TIMEOUT=300000 VUE_APP_REPEAT_SUBMIT_INTERVAL=500 # 前端域名配置 # 🚨 生产环境部署前必须修改此地址! -VUE_APP_FRONTEND_URL=https://m.hzdyjsxy.cn:18080/login?redirect=/index +#VUE_APP_FRONTEND_URL=https://m.hzdyjsxy.cn:18080/login?redirect=/index +VUE_APP_FRONTEND_URL=http://m.hzdyjsxy.cn:18080/login?redirect=/index # 加密配置 VUE_APP_RSA_PUBLIC_KEY=MFwwDQYJKoZIhvcNAQEBBQADSwAwSAJBAKoR8mX0rGKLqzcWmOzbfj64K8ZIgOdHnzkXSOVOZbFu/TJhZ7rFAN+eaGkl3C4buccQd/EjEsj9ir7ijT7h96MCAwEAAQ== diff --git a/mobile/src/pages/visit/index.vue b/mobile/src/pages/visit/index.vue index 8dde96f0..1de9424e 100644 --- a/mobile/src/pages/visit/index.vue +++ b/mobile/src/pages/visit/index.vue @@ -9,15 +9,29 @@ - + + + + + + + + @@ -26,8 +40,12 @@ @@ -35,9 +53,13 @@ @@ -46,9 +68,13 @@ @@ -74,22 +100,6 @@ - - - - {{ showFilter ? '收起筛选' : '展开筛选' }} - - - 新增走访 - - - - + - - {{ item.studentName }} - {{ item.studentNo }} + + + + + {{ item.companyName || '未填写企业' }} - - - - - - - - - {{ item.companyName || '-' }} - - - - - - {{ item.visitDate || '-' }} - - {{ item.visitorName || '-' }} - - - - - {{ item.className || '-' }} / {{ item.majorName || '-' }} - + + + + + 学生 + + {{ item.studentName || '-' }} + + ({{ item.studentNo }}) + + + + + + 日期 + {{ item.visitDate || '-' }} + + + + 走访人 + {{ item.visitorName || '-' }} + + + + 班级 + + {{ item.className || '-' }} + / {{ item.majorName }} + + @@ -215,9 +231,11 @@ @@ -227,6 +245,11 @@ @confirm="handleDateConfirm" @close="showDatePicker = false" /> + + + + + @@ -269,6 +292,14 @@ export default { showDatePicker: false, dateRangeText: '', selectedDateRange: [], + + // 筛选输入框样式(与搜索框高度一致:u-search 默认 32px) + filterInputStyle: { + backgroundColor: '#f6f6f6', + padding: '0 24rpx', + height: '32px', + boxSizing: 'border-box', + }, }; }, @@ -419,11 +450,14 @@ export default { }, // 状态选择确认 - handleStatusConfirm(value) { - const selected = value.value[0]; - this.queryParams.status = selected.value; - this.statusText = selected.text; - this.currentStatusIndex = value.index[0]; + handleStatusConfirm(e) { + const index = e.indexs[0]; + const selected = this.statusOptions[0][index]; + if (selected) { + this.queryParams.status = selected.value; + this.statusText = selected.text; + this.currentStatusIndex = index; + } this.showStatusPicker = false; }, @@ -551,12 +585,37 @@ export default { .search-bar { padding: 20rpx; background: #ffffff; + + .search-row { + display: flex; + align-items: center; + gap: 16rpx; + } + + .search-input-wrap { + flex: 1; + min-width: 0; + } + + .filter-toggle { + width: 72rpx; + height: 72rpx; + border-radius: 50%; + background: #f6f6f6; + display: flex; + align-items: center; + justify-content: center; + flex-shrink: 0; + + &:active { + opacity: 0.8; + } + } } .filter-bar { background: #ffffff; padding: 0 20rpx 20rpx; - border-bottom: 1rpx solid #ebeef5; .filter-item { margin-bottom: 20rpx; @@ -569,17 +628,30 @@ export default { } } -.action-bar { - display: flex; - justify-content: space-between; - align-items: center; - padding: 20rpx; - background: #ffffff; - border-bottom: 1rpx solid #ebeef5; -} - .content-wrapper { padding: 20rpx; + padding-bottom: 160rpx; +} + +.fab-button { + position: fixed; + right: 20px; + bottom: 30px; + width: 56px; + height: 56px; + border-radius: 50%; + background: linear-gradient(135deg, #007aff, #0051d9); + display: flex; + align-items: center; + justify-content: center; + box-shadow: 0 4px 16px rgba(0, 122, 255, 0.3); + transition: all 0.3s ease; + z-index: 999; + + &:active { + transform: scale(0.95); + box-shadow: 0 2px 8px rgba(0, 122, 255, 0.4); + } } .empty-container { @@ -590,66 +662,95 @@ export default { .list-content { .visit-card { background: #ffffff; - border-radius: 12rpx; - padding: 24rpx; - margin-bottom: 20rpx; - box-shadow: 0 2rpx 12rpx rgba(0, 0, 0, 0.08); - transition: all 0.3s ease; + border-radius: 16rpx; + padding: 0; + margin-bottom: 24rpx; + box-shadow: 0 4rpx 16rpx rgba(60, 156, 255, 0.08); + overflow: hidden; + transition: all 0.2s ease; &:active { - transform: scale(0.99); - box-shadow: 0 2rpx 8rpx rgba(0, 0, 0, 0.06); + transform: scale(0.985); + box-shadow: 0 2rpx 10rpx rgba(60, 156, 255, 0.06); } .card-header { display: flex; justify-content: space-between; - align-items: flex-start; - margin-bottom: 16rpx; + align-items: center; + padding: 24rpx 24rpx 20rpx; + background: linear-gradient(135deg, #f5f9ff 0%, #ffffff 100%); + border-bottom: 1rpx solid #f0f3f8; - .student-info { + .company-title { + display: flex; + align-items: center; flex: 1; + min-width: 0; + margin-right: 16rpx; - .student-name { + .company-icon { + display: flex; + align-items: center; + justify-content: center; + flex-shrink: 0; + margin-right: 12rpx; + } + + .company-name { font-size: 32rpx; font-weight: 600; color: #303133; - margin-right: 16rpx; + overflow: hidden; + text-overflow: ellipsis; + white-space: nowrap; } - - .student-no { - font-size: 26rpx; - color: #909399; - } - } - - .status-badge { - flex-shrink: 0; } } - .card-row { - display: flex; - align-items: center; - margin-bottom: 12rpx; + .card-body { + padding: 20rpx 24rpx 8rpx; - .info-text { - font-size: 28rpx; - color: #606266; - margin-left: 8rpx; - } - - &:last-of-type { + .info-row { + display: flex; + align-items: center; margin-bottom: 16rpx; + + .info-label { + width: 80rpx; + flex-shrink: 0; + font-size: 24rpx; + color: #909399; + margin-left: 10rpx; + } + + .info-value { + flex: 1; + min-width: 0; + font-size: 28rpx; + color: #606266; + + .info-sub { + font-size: 24rpx; + color: #909399; + } + + &--ellipsis { + overflow: hidden; + text-overflow: ellipsis; + white-space: nowrap; + } + } } } .card-actions { display: flex; justify-content: flex-end; + align-items: center; gap: 10rpx; - padding-top: 16rpx; - border-top: 1rpx solid #ebeef5; + padding: 16rpx 24rpx 20rpx; + border-top: 1rpx solid #f0f3f8; } } } diff --git a/mobile/src/pages/workStudy/index.vue b/mobile/src/pages/workStudy/index.vue index 8b0a990b..ba57679f 100644 --- a/mobile/src/pages/workStudy/index.vue +++ b/mobile/src/pages/workStudy/index.vue @@ -8,16 +8,38 @@ - - + + + + + + + + + + + + @@ -43,9 +65,13 @@ @@ -54,18 +80,29 @@ - + 筛选 - - - - {{ showFilter ? '收起筛选' : '展开筛选' }} - - - 刷新 - - - @@ -282,6 +299,7 @@ keyName="label" @confirm="onStatusConfirm" @cancel="showStatusPicker = false" + @close="showStatusPicker = false" /> @@ -316,6 +334,13 @@ export default { showStatusPicker: false, scopeText: '', statusText: '', + // 筛选输入框样式(与搜索框高度一致) + filterInputStyle: { + backgroundColor: '#f6f6f6', + padding: '0 24rpx', + height: '32px', + boxSizing: 'border-box', + }, // 选择器选项(字典) scopeOptions: [[]], @@ -919,24 +944,48 @@ export default { \ No newline at end of file +