fix: 显式声明接口参数名并优化移动端若干页面

生产环境未保留方法参数名时 Spring 无法绑定 @RequestParam/@PathVariable,补齐注解名称并在 Maven 编译中强制 -parameters;同时优化走访、勤工助学、请假和宿舍点名页交互。

Co-authored-by: Cursor <cursoragent@cursor.com>
This commit is contained in:
zlwuandCursor committed 2026-08-18 11:48:08 +08:00
1 parent a15efa8ef8
commit 1d67506451
187 files changed
+1768 -1294

No files matched your search

+24
View File
@@ -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<Void> selectAuthUserAll(@RequestParam("roleId") Long roleId,
@RequestParam("userIds") Long[] userIds) { ... }
@GetMapping("/{roleId}")
public R<SysRoleVo> getInfo(@PathVariable("roleId") Long roleId) { ... }
// ❌ 错误(本地 IDEA 可能正常,生产易 500)
public R<Void> selectAuthUserAll(Long roleId, Long[] userIds) { ... }
public R<SysRoleVo> getInfo(@PathVariable Long roleId) { ... }
```
父 POM 已配置 `<parameters>true</parameters>` 与 `-parameters` 作为兜底,但接口代码仍必须显式声明参数名。
#### 🚨 接口开发检查清单
**每个新接口必须检查**:
@@ -752,6 +775,7 @@ public class UserBo {
- [ ] 是否添加了@SaCheckPermission 权限注解?
- [ ] 是否添加了@Operation 接口描述?
- [ ] 是否进行了参数校验?
- [ ] `@RequestParam`/`@PathVariable` 是否显式声明了参数名?
- [ ] 是否符合 RESTful 命名规范?
- [ ] 是否包含了必要的请求头(clientid、Content-Type 等)?
- [ ] 是否在 API 文档中记录了接口信息?
+18
View File
@@ -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
+4
View File
@@ -17,6 +17,8 @@
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
<project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
<java.version>17</java.version>
<!-- 强制 javac 保留方法参数名,避免生产环境 Spring 绑定 @RequestParam 失败 -->
<maven.compiler.parameters>true</maven.compiler.parameters>
<mybatis.version>3.5.16</mybatis.version>
<springdoc.version>2.8.8</springdoc.version>
<therapi-javadoc.version>0.15.0</therapi-javadoc.version>
@@ -480,6 +482,8 @@
<version>${mapstruct-plus.lombok.version}</version>
</path>
</annotationProcessorPaths>
<!-- 强制保留方法参数名,避免 @PathVariable/@RequestParam 缺少显式名称时运行时报错 -->
<parameters>true</parameters>
<compilerArgs>
<arg>-parameters</arg>
</compilerArgs>
@@ -118,7 +118,7 @@ public class AuthController {
*/
@GetMapping("/binding/{source}")
public R<String> 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<Void> unlockSocial(@PathVariable Long socialId) {
public R<Void> unlockSocial(@PathVariable("socialId") Long socialId) {
// 校验token
StpUtil.checkLogin();
Boolean rows = socialUserService.deleteWithValidById(socialId);
@@ -105,7 +105,7 @@ public class AssessmentApprovalController extends BaseController {
// @SaCheckPermission("bzrkh:assessmentApproval:delete")
@Log(title = "班主任考核审核", businessType = BusinessType.DELETE)
@DeleteMapping("/deleteAbnormalRecord")
public R<Void> deleteAbnormalRecord(@RequestParam Long planId, @RequestParam Long evaluatedUserId) {
public R<Void> deleteAbnormalRecord(@RequestParam("planId") Long planId, @RequestParam("evaluatedUserId") Long evaluatedUserId) {
boolean result = assessmentApprovalService.deleteAbnormalRecord(planId, evaluatedUserId);
return result ? R.ok() : R.fail("删除异常记录失败");
}
@@ -73,7 +73,7 @@ public class BmzrAssessmentIndicatorController extends BaseController {
*/
// @SaCheckPermission("bzrkh:assessmentIndicator:query")
@GetMapping("/{id}")
public R<BmzrAssessmentIndicatorVo> getInfo(@NotNull(message = "主键不能为空") @PathVariable Long id) {
public R<BmzrAssessmentIndicatorVo> 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<Void> remove(@NotEmpty(message = "主键不能为空") @PathVariable Long[] ids) {
public R<Void> remove(@NotEmpty(message = "主键不能为空") @PathVariable("ids") Long[] ids) {
return toAjax(bmzrAssessmentIndicatorService.deleteWithValidByIds(List.of(ids), true));
}
}
@@ -73,7 +73,7 @@ public class BmzrAssessmentIndicatorTypeController extends BaseController {
*/
// @SaCheckPermission("bzrkh:assessmentIndicatorType:query")
@GetMapping("/{id}")
public R<BmzrAssessmentIndicatorTypeVo> getInfo(@NotNull(message = "主键不能为空") @PathVariable Long id) {
public R<BmzrAssessmentIndicatorTypeVo> 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<Void> remove(@NotEmpty(message = "主键不能为空") @PathVariable Long[] ids) {
public R<Void> remove(@NotEmpty(message = "主键不能为空") @PathVariable("ids") Long[] ids) {
return toAjax(bmzrAssessmentIndicatorTypeService.deleteWithValidByIds(List.of(ids), true));
}
}
@@ -61,7 +61,7 @@ public class BmzrAssessmentPlanController extends BaseController {
*/
// @SaCheckPermission("bzrkh:assessmentPlan:query")
@GetMapping("/{id}")
public R<BmzrAssessmentPlanVo> getInfo(@NotNull(message = "主键不能为空") @PathVariable Long id) {
public R<BmzrAssessmentPlanVo> 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<Void> remove(@NotEmpty(message = "主键不能为空") @PathVariable Long[] ids) {
public R<Void> remove(@NotEmpty(message = "主键不能为空") @PathVariable("ids") Long[] ids) {
return toAjax(bmzrAssessmentPlanService.deleteWithValidByIds(List.of(ids), true));
}
@@ -65,7 +65,7 @@ public class BmzrAssessmentSchemeController extends BaseController {
*/
// @SaCheckPermission("bzrkh:assessmentScheme:query")
@GetMapping("/{id}")
public R<BmzrAssessmentSchemeVo> getInfo(@NotNull(message = "主键不能为空") @PathVariable Long id) {
public R<BmzrAssessmentSchemeVo> 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<Void> remove(@NotEmpty(message = "主键不能为空") @PathVariable Long[] ids) {
public R<Void> remove(@NotEmpty(message = "主键不能为空") @PathVariable("ids") Long[] ids) {
return toAjax(bmzrAssessmentSchemeService.deleteWithValidByIds(List.of(ids), true));
}
}
@@ -51,7 +51,7 @@ public class BmzrAssessmentSchemeIndicatorController extends BaseController {
*/
// @SaCheckPermission("bzrkh:assessmentSchemeIndicator:list")
@GetMapping("/listBySchemeId/{schemeId}")
public R<List<BmzrAssessmentSchemeIndicatorVo>> listBySchemeId(@PathVariable Long schemeId) {
public R<List<BmzrAssessmentSchemeIndicatorVo>> listBySchemeId(@PathVariable("schemeId") Long schemeId) {
List<BmzrAssessmentSchemeIndicatorVo> 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<BmzrAssessmentSchemeIndicatorVo> getInfo(@NotNull(message = "主键不能为空") @PathVariable Long id) {
public R<BmzrAssessmentSchemeIndicatorVo> 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<Void> remove(@NotEmpty(message = "主键不能为空") @PathVariable Long[] ids) {
public R<Void> 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<Void> batchSave(@PathVariable Long schemeId,
public R<Void> batchSave(@PathVariable("schemeId") Long schemeId,
@RequestBody List<BmzrAssessmentSchemeIndicatorBo> indicatorList) {
return toAjax(bmzrAssessmentSchemeIndicatorService.batchSaveSchemeIndicators(schemeId, indicatorList));
}
@@ -44,7 +44,7 @@ public class TeacherAssessmentController extends BaseController {
*/
// @SaCheckPermission("bzrkh:teacherAssessment:list")
@GetMapping("/classes")
public R<List<TeacherClassVo>> getTeacherClasses(@RequestParam(required = false) Long teacherId) {
public R<List<TeacherClassVo>> getTeacherClasses(@RequestParam(value = "teacherId", required = false) Long teacherId) {
// 如果没有传入teacherId,则使用当前登录用户ID
Long currentTeacherId = teacherId != null ? teacherId : LoginHelper.getUserId();
List<TeacherClassVo> list = teacherAssessmentService.queryTeacherClassList(currentTeacherId);
@@ -105,7 +105,7 @@ public class TeacherAssessmentController extends BaseController {
*/
// @SaCheckPermission("bzrkh:teacherAssessment:detail")
@GetMapping("/detail")
public R<Object> getAssessmentDetail(@RequestParam Long planId, @RequestParam Long classId) {
public R<Object> 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<AssessmentDetailVo> getAssessmentSubmitDetail(@RequestParam Long planId, @RequestParam Long classId) {
public R<AssessmentDetailVo> 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<Object> testStudentCountCoefficient(@RequestParam int studentCount) {
public R<Object> 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<ClassStudentRecordsVo> getClassStudentRecords(@RequestParam Long classId, @RequestParam Long planId) {
public R<ClassStudentRecordsVo> getClassStudentRecords(@RequestParam("classId") Long classId, @RequestParam("planId") Long planId) {
ClassStudentRecordsVo records = teacherAssessmentService.queryClassStudentRecords(classId, planId);
return R.ok(records);
}
@@ -66,7 +66,7 @@ public class CwApprovalRecordController extends BaseController {
*/
// @SaCheckPermission("cw:approval:query")
@GetMapping("/{id}")
public R<CwApprovalRecordVo> getInfo(@NotNull(message = "主键不能为空") @PathVariable Long id) {
public R<CwApprovalRecordVo> 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<List<CwApprovalRecordVo>> getByApplicationId(@PathVariable Long applicationId) {
public R<List<CwApprovalRecordVo>> getByApplicationId(@PathVariable("applicationId") Long applicationId) {
List<CwApprovalRecordVo> 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<Void> remove(@NotEmpty(message = "主键不能为空") @PathVariable Long[] ids) {
public R<Void> 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<Void> createProcess(@PathVariable Long applicationId, @RequestParam String applicationNo) {
public R<Void> 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<Void> processApproval(@RequestParam Long applicationId,
@RequestParam String nodeCode,
@RequestParam String approveAction,
@RequestParam(required = false) String approveOpinion) {
public R<Void> 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<Void> deptApprove(@RequestParam Long applicationId,
@RequestParam String approveAction,
@RequestParam(required = false) String approveOpinion) {
public R<Void> 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<CwApprovalRecordVo> getCurrentNode(@PathVariable Long applicationId) {
public R<CwApprovalRecordVo> 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<Boolean> checkPermission(@PathVariable Long applicationId, @RequestParam String nodeCode) {
public R<Boolean> 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<Boolean> checkDeptPermission(@PathVariable Long applicationId) {
public R<Boolean> 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<List<Map<String, Object>>> getAvailableApprovers(@PathVariable Long applicationId) {
public R<List<Map<String, Object>>> getAvailableApprovers(@PathVariable("applicationId") Long applicationId) {
List<Map<String, Object>> 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<Void> leaderApproval(@RequestParam Long applicationId,
@RequestParam String approveAction,
@RequestParam String approveOpinion) {
public R<Void> 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<Void> financeApproval(@RequestParam Long applicationId,
@RequestParam String approveAction,
@RequestParam String approveOpinion,
@RequestParam(required = false) Long selectedApproverId) {
public R<Void> 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);
@@ -51,7 +51,7 @@ public class CwMonitoringManagementController extends BaseController {
*/
//@SaCheckPermission("cw:monitoringManagement:query")
@GetMapping("/{id}")
public R<CwProjectPerformanceSelfEvaluationVo> getInfo(@NotNull(message = "主键不能为空") @PathVariable Long id) {
public R<CwProjectPerformanceSelfEvaluationVo> 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<Void> lock(@NotNull(message = "主键不能为空") @PathVariable Long id) {
public R<Void> 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<Void> unlock(@NotNull(message = "主键不能为空") @PathVariable Long id) {
public R<Void> unlock(@NotNull(message = "主键不能为空") @PathVariable("id") Long id) {
return toAjax(monitoringManagementService.unlockEvaluation(id));
}
@@ -37,7 +37,7 @@ public class CwPerformanceMonitoringController extends BaseController {
*/
//@SaCheckPermission("cw:performanceMonitoring:query")
@GetMapping("/list/{evaluationId}")
public R<List<CwPerformanceMonitoringVo>> listByEvaluationId(@NotNull(message = "自评ID不能为空") @PathVariable Long evaluationId) {
public R<List<CwPerformanceMonitoringVo>> 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<CwPerformanceMonitoringVo> getInfo(@NotNull(message = "主键不能为空") @PathVariable Long id) {
public R<CwPerformanceMonitoringVo> 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<Void> remove(@NotNull(message = "主键不能为空") @PathVariable Long id) {
public R<Void> remove(@NotNull(message = "主键不能为空") @PathVariable("id") Long id) {
return toAjax(performanceMonitoringService.deleteWithValidByIds(List.of(id), true));
}
}
@@ -54,7 +54,7 @@ public class CwProjectApplicationController extends BaseController {
*/
//@SaCheckPermission("cw:application:list")
@GetMapping("/myList")
public R<List<CwProjectApplicationVo>> myList(@RequestParam(required = false) Integer year) {
public R<List<CwProjectApplicationVo>> myList(@RequestParam(value = "year", required = false) Integer year) {
Long applicantId = LoginHelper.getUserId();
List<CwProjectApplicationVo> 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<List<CwProjectApplicationVo>> deptList(@RequestParam Long departmentId, @RequestParam(required = false) Integer year) {
public R<List<CwProjectApplicationVo>> deptList(@RequestParam("departmentId") Long departmentId, @RequestParam(value = "year", required = false) Integer year) {
List<CwProjectApplicationVo> 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<Map<String, Object>> getStatusStatistics(@RequestParam(required = false) String budgetYear) {
public R<Map<String, Object>> getStatusStatistics(@RequestParam(value = "budgetYear", required = false) String budgetYear) {
Map<String, Object> 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<List<Map<String, Object>>> getDepartmentStatistics(@RequestParam(required = false) String budgetYear) {
public R<List<Map<String, Object>>> getDepartmentStatistics(@RequestParam(value = "budgetYear", required = false) String budgetYear) {
List<Map<String, Object>> 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<CwProjectApplicationVo> 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<CwProjectApplicationVo> getInfoByNo(@PathVariable String applicationNo) {
public R<CwProjectApplicationVo> 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<Void> submit(@PathVariable Long id) {
public R<Void> 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<Void> withdraw(@PathVariable Long id) {
public R<Void> 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<Void> cancel(@PathVariable Long id) {
public R<Void> 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<Void> 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<java.util.Map<String, Object>> statistics(@RequestParam(required = false) Integer year) {
public R<java.util.Map<String, Object>> statistics(@RequestParam(value = "year", required = false) Integer year) {
java.util.Map<String, Object> result = new java.util.HashMap<>();
// 申报数量统计 - 使用字符串状态值
@@ -93,7 +93,7 @@ public class CwProjectApprovalController extends BaseController {
//@SaCheckPermission("cw:projectApproval:query")
@GetMapping("/{id}")
public R<CwProjectApprovalProcessVo> 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<List<CwApprovalRecordVo>> getApprovalRecords(@PathVariable Long applicationId) {
public R<List<CwApprovalRecordVo>> 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<Void> terminate(@NotEmpty(message = "主键不能为空")
@PathVariable Long[] ids) {
@PathVariable("ids") Long[] ids) {
return toAjax(projectApprovalService.terminateProcess(List.of(ids)));
}
@@ -63,7 +63,7 @@ public class CwProjectAuditorController extends BaseController {
//@SaCheckPermission("cw:projectAuditor:query")
@GetMapping("/{id}")
public R<CwProjectAuditorVo> 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<Void> 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<List<Object>> getDeptUsers(@PathVariable Long deptId) {
public R<List<Object>> 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<Void> enable(@PathVariable Long[] ids) {
public R<Void> 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<Void> disable(@PathVariable Long[] ids) {
public R<Void> disable(@PathVariable("ids") Long[] ids) {
return toAjax(cwProjectAuditorService.updateStatus(List.of(ids), "0"));
}
@@ -51,7 +51,7 @@ public class CwProjectEvaluationIndicatorController extends BaseController {
*/
//@SaCheckPermission("cw:indicator:query")
@GetMapping("/{id}")
public R<CwProjectEvaluationIndicatorVo> getInfo(@NotNull(message = "主键不能为空") @PathVariable Long id) {
public R<CwProjectEvaluationIndicatorVo> 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<List<CwProjectEvaluationIndicatorVo>> getByEvaluationId(@NotNull(message = "自评ID不能为空") @PathVariable Long evaluationId) {
public R<List<CwProjectEvaluationIndicatorVo>> 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<List<CwProjectEvaluationIndicatorVo>> 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<Void> batchSave(@RequestParam Long evaluationId, @RequestBody List<CwProjectEvaluationIndicatorBo> boList) {
public R<Void> batchSave(@RequestParam("evaluationId") Long evaluationId, @RequestBody List<CwProjectEvaluationIndicatorBo> 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<Void> remove(@NotEmpty(message = "主键不能为空") @PathVariable Long[] ids) {
public R<Void> remove(@NotEmpty(message = "主键不能为空") @PathVariable("ids") Long[] ids) {
return toAjax(indicatorService.deleteWithValidByIds(Arrays.asList(ids), true));
}
@@ -52,7 +52,7 @@ public class CwProjectMonthlyMonitoringController extends BaseController {
*/
//@SaCheckPermission("cw:monitoring:query")
@GetMapping("/{id}")
public R<CwProjectMonthlyMonitoringVo> getInfo(@NotNull(message = "主键不能为空") @PathVariable Long id) {
public R<CwProjectMonthlyMonitoringVo> 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<List<CwProjectMonthlyMonitoringVo>> getByEvaluationId(@NotNull(message = "自评ID不能为空") @PathVariable Long evaluationId) {
public R<List<CwProjectMonthlyMonitoringVo>> 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<Map<Integer, CwProjectMonthlyMonitoringVo>> 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<Void> batchSave(@RequestParam Long evaluationId, @RequestBody List<CwProjectMonthlyMonitoringBo> boList) {
public R<Void> batchSave(@RequestParam("evaluationId") Long evaluationId, @RequestBody List<CwProjectMonthlyMonitoringBo> 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<Void> remove(@NotEmpty(message = "主键不能为空") @PathVariable Long[] ids) {
public R<Void> remove(@NotEmpty(message = "主键不能为空") @PathVariable("ids") Long[] ids) {
return toAjax(monitoringService.deleteWithValidByIds(Arrays.asList(ids), true));
}
@@ -54,7 +54,7 @@ public class CwProjectPerformanceSelfEvaluationController extends BaseController
*/
//@SaCheckPermission("cw:evaluation:query")
@GetMapping("/{id}")
public R<CwProjectPerformanceSelfEvaluationVo> getInfo(@NotNull(message = "主键不能为空") @PathVariable Long id) {
public R<CwProjectPerformanceSelfEvaluationVo> 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<Void> submit(@NotNull(message = "主键不能为空") @PathVariable Long id) {
public R<Void> 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<Void> approve(@NotNull(message = "主键不能为空") @PathVariable Long id,
@RequestParam String opinion,
@RequestParam Boolean approved) {
public R<Void> 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<Void> remove(@NotEmpty(message = "主键不能为空") @PathVariable Long[] ids) {
public R<Void> remove(@NotEmpty(message = "主键不能为空") @PathVariable("ids") Long[] ids) {
return toAjax(evaluationService.deleteWithValidByIds(Arrays.asList(ids), true));
}
@@ -141,7 +141,7 @@ public class TestDemoController extends BaseController {
@Log(title = "测试单表", businessType = BusinessType.DELETE)
@DeleteMapping("/{ids}")
public R<Void> remove(@NotEmpty(message = "主键不能为空")
@PathVariable Long[] ids) {
@PathVariable("ids") Long[] ids) {
return toAjax(testDemoService.deleteWithValidByIds(Arrays.asList(ids), true));
}
}
@@ -101,7 +101,7 @@ public class TestTreeController extends BaseController {
@Log(title = "测试树表", businessType = BusinessType.DELETE)
@DeleteMapping("/{ids}")
public R<Void> remove(@NotEmpty(message = "主键不能为空")
@PathVariable Long[] ids) {
@PathVariable("ids") Long[] ids) {
return toAjax(testTreeService.deleteWithValidByIds(Arrays.asList(ids), true));
}
}
@@ -52,7 +52,7 @@ public class GenController extends BaseController {
*/
@SaCheckPermission("tool:gen:query")
@GetMapping(value = "/{tableId}")
public R<Map<String, Object>> getInfo(@PathVariable Long tableId) {
public R<Map<String, Object>> getInfo(@PathVariable("tableId") Long tableId) {
GenTable table = genTableService.selectGenTableById(tableId);
List<GenTable> tables = genTableService.selectGenTableAll();
List<GenTableColumn> 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<Void> remove(@PathVariable Long[] tableIds) {
public R<Void> remove(@PathVariable("tableIds") Long[] tableIds) {
genTableService.deleteGenTableByIds(tableIds);
return R.ok();
}
@@ -67,7 +67,7 @@ public class HqHallInfoController extends BaseController {
@ApiEncrypt(response = true)
//@SaCheckPermission("hq:hallInfo:query")
@GetMapping("/{id}")
public R<HqHallInfoVo> getInfo(@NotNull(message = "主键不能为空") @PathVariable Long id) {
public R<HqHallInfoVo> 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<Void> remove(@NotEmpty(message = "主键不能为空") @PathVariable Long[] ids) {
public R<Void> remove(@NotEmpty(message = "主键不能为空") @PathVariable("ids") Long[] ids) {
return toAjax(hqHallInfoService.deleteWithValidByIds(List.of(ids), true));
}
}
@@ -70,7 +70,7 @@ public class HqHallReservationController extends BaseController {
@ApiEncrypt(response = true)
//@SaCheckPermission("hq:hallReservation:query")
@GetMapping("/{id}")
public R<HqHallReservationVo> getInfo(@NotNull(message = "主键不能为空") @PathVariable Long id) {
public R<HqHallReservationVo> 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<Void> remove(@NotEmpty(message = "主键不能为空") @PathVariable Long[] ids) {
public R<Void> remove(@NotEmpty(message = "主键不能为空") @PathVariable("ids") Long[] ids) {
return toAjax(hqHallReservationService.deleteWithValidByIds(List.of(ids), true));
}
@@ -63,7 +63,7 @@ public class HqPmRepairAttachmentController extends BaseController {
*/
//@SaCheckPermission("pm:attachment:query")
@GetMapping("/{id}")
public R<HqPmRepairAttachmentVo> getInfo(@NotNull(message = "主键不能为空") @PathVariable Long id) {
public R<HqPmRepairAttachmentVo> 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<Void> remove(@NotEmpty(message = "主键不能为空") @PathVariable Long[] ids) {
public R<Void> remove(@NotEmpty(message = "主键不能为空") @PathVariable("ids") Long[] ids) {
return toAjax(attachmentService.deleteWithValidByIds(List.of(ids), true));
}
@@ -61,7 +61,7 @@ public class HqPmRepairCategoryController extends BaseController {
*/
//@SaCheckPermission("pm:category:query")
@GetMapping("/{id}")
public R<HqPmRepairCategoryVo> getInfo(@NotNull(message = "主键不能为空") @PathVariable Long id) {
public R<HqPmRepairCategoryVo> 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<Void> remove(@NotEmpty(message = "主键不能为空") @PathVariable Long[] ids) {
public R<Void> remove(@NotEmpty(message = "主键不能为空") @PathVariable("ids") Long[] ids) {
return toAjax(repairCategoryService.deleteWithValidByIds(List.of(ids), true));
}
@@ -65,7 +65,7 @@ public class HqPmRepairOrderController extends BaseController {
*/
//@SaCheckPermission("pm:repairOrder:query")
@GetMapping("/{id}")
public R<HqPmRepairOrderVo> getInfo(@NotNull(message = "主键不能为空") @PathVariable Long id) {
public R<HqPmRepairOrderVo> 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<Void> remove(@NotEmpty(message = "主键不能为空") @PathVariable Long[] ids) {
public R<Void> 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<Void> 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<Void> startRepair(@NotNull(message = "工单ID不能为空") @PathVariable Long orderId) {
public R<Void> 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<Void> 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<Void> 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<List<java.util.Map<String, Object>>> getRepairProgress(
@NotNull(message = "工单ID不能为空") @PathVariable Long orderId) {
@NotNull(message = "工单ID不能为空") @PathVariable("orderId") Long orderId) {
List<java.util.Map<String, Object>> progressList = repairOrderService.getRepairProgress(orderId);
return R.ok(progressList);
}
@@ -284,7 +284,7 @@ public class HqPmRepairOrderController extends BaseController {
@RepeatSubmit()
@PutMapping("/{orderId}/complete")
public R<Void> completeOrder(
@NotNull(message = "工单ID不能为空") @PathVariable Long orderId,
@NotNull(message = "工单ID不能为空") @PathVariable("orderId") Long orderId,
@RequestBody java.util.Map<String, Object> 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<java.util.Map<String, Object>> getServiceEvaluation(
@NotNull(message = "工单ID不能为空") @PathVariable Long orderId) {
@NotNull(message = "工单ID不能为空") @PathVariable("orderId") Long orderId) {
// 从service获取真实评价数据
java.util.Map<String, Object> 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<List<HqPmRepairAttachmentVo>> getRepairAttachments(
@NotNull(message = "工单ID不能为空") @PathVariable Long orderId) {
@NotNull(message = "工单ID不能为空") @PathVariable("orderId") Long orderId) {
List<HqPmRepairAttachmentVo> attachments = attachmentService.queryByOrderId(orderId);
return R.ok(attachments);
}
@@ -74,7 +74,7 @@ public class HqSatCategoryController extends BaseController {
//@SaCheckPermission("hq:satCategory:query")
@GetMapping("/{id}")
public R<HqSatCategoryVo> 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<Void> remove(@NotEmpty(message = "主键不能为空")
@PathVariable Long[] ids) {
@PathVariable("ids") Long[] ids) {
return toAjax(hqSatCategoryService.deleteWithValidByIds(List.of(ids), true));
}
}
@@ -64,7 +64,7 @@ public class HqSatDetailController extends BaseController {
//@SaCheckPermission("hq:satDetail:query")
@GetMapping("/{id}")
public R<HqSatDetailVo> 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<Void> remove(@NotEmpty(message = "主键不能为空")
@PathVariable Long[] ids) {
@PathVariable("ids") Long[] ids) {
return toAjax(hqSatDetailService.deleteWithValidByIds(List.of(ids), true));
}
}
@@ -64,7 +64,7 @@ public class HqSatOptionController extends BaseController {
//@SaCheckPermission("hq:satOption:query")
@GetMapping("/{id}")
public R<HqSatOptionVo> 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<Void> remove(@NotEmpty(message = "主键不能为空")
@PathVariable Long[] ids) {
@PathVariable("ids") Long[] ids) {
return toAjax(hqSatOptionService.deleteWithValidByIds(List.of(ids), true));
}
}
@@ -67,7 +67,7 @@ public class HqSatQuestionController extends BaseController {
*/
//@SaCheckPermission("hq:satQuestion:query")
@GetMapping("/{id}")
public R<HqSatQuestionVo> getInfo(@NotNull(message = "主键不能为空") @PathVariable Long id) {
public R<HqSatQuestionVo> 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<Void> remove(@NotEmpty(message = "主键不能为空") @PathVariable Long[] ids) {
public R<Void> 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<List<HqSatOptionVo>> getQuestionOptions(@PathVariable Long questionId) {
public R<List<HqSatOptionVo>> getQuestionOptions(@PathVariable("questionId") Long questionId) {
// 根据题目ID获取该题目的选项
HqSatOptionBo bo = new HqSatOptionBo();
bo.setQuestionId(questionId); // 使用questionId进行过滤
@@ -64,7 +64,7 @@ public class HqSatRecordController extends BaseController {
//@SaCheckPermission("hq:satRecord:query")
@GetMapping("/{id}")
public R<HqSatRecordVo> 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<Void> remove(@NotEmpty(message = "主键不能为空")
@PathVariable Long[] ids) {
@PathVariable("ids") Long[] ids) {
return toAjax(hqSatRecordService.deleteWithValidByIds(List.of(ids), true));
}
}
@@ -92,7 +92,7 @@ public class HqSatSurveyController extends BaseController {
*/
//@SaCheckPermission("hq:satSurvey:query")
@GetMapping("/{id}")
public R<HqSatSurveyVo> getInfo(@NotNull(message = "主键不能为空") @PathVariable Long id) {
public R<HqSatSurveyVo> 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<Void> remove(@NotEmpty(message = "主键不能为空") @PathVariable Long[] ids) {
public R<Void> 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<List<HqSatSurveyQuestionVo>> 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<Void> updateSurveyQuestions(@NotNull(message = "问卷ID不能为空") @PathVariable Long surveyId,
public R<Void> updateSurveyQuestions(@NotNull(message = "问卷ID不能为空") @PathVariable("surveyId") Long surveyId,
@RequestBody List<Object> 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<Void> publishSurvey(@NotNull(message = "问卷ID不能为空") @PathVariable Long id) {
public R<Void> 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<Void> unpublishSurvey(@NotNull(message = "问卷ID不能为空") @PathVariable Long id) {
public R<Void> 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<Boolean> checkUserAnswered(@NotNull(message = "问卷ID不能为空") @PathVariable Long surveyId) {
public R<Boolean> 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<HqSatRecordVo> getUserSurveyAnswer(@NotNull(message = "问卷ID不能为空") @PathVariable Long surveyId) {
public R<HqSatRecordVo> 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<java.util.Map<String, Object>> getSurveyStatistics(@NotNull(message = "问卷ID不能为空") @PathVariable Long surveyId) {
public R<java.util.Map<String, Object>> 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<java.util.Map<String, Object>> 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<java.util.Map<String, Object>> getAnswerRecordDetail(@NotNull(message = "记录ID不能为空") @PathVariable Long recordId) {
public R<java.util.Map<String, Object>> 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);
}
}
@@ -64,7 +64,7 @@ public class HqSatSurveyQuestionController extends BaseController {
//@SaCheckPermission("hq:satSurveyQuestion:query")
@GetMapping("/{id}")
public R<HqSatSurveyQuestionVo> 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<Void> remove(@NotEmpty(message = "主键不能为空")
@PathVariable Long[] ids) {
@PathVariable("ids") Long[] ids) {
return toAjax(hqSatSurveyQuestionService.deleteWithValidByIds(List.of(ids), true));
}
}
@@ -61,7 +61,7 @@ public class HqVenueInfoController extends BaseController {
*/
//@SaCheckPermission("hq:venue:query")
@GetMapping("/{id}")
public R<HqVenueInfoVo> getInfo(@NotNull(message = "主键不能为空") @PathVariable Long id) {
public R<HqVenueInfoVo> 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<Void> remove(@NotEmpty(message = "主键不能为空") @PathVariable Long[] ids) {
public R<Void> 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<HqVenueInfoVo> getByCode(@PathVariable String venueCode) {
public R<HqVenueInfoVo> getByCode(@PathVariable("venueCode") String venueCode) {
return R.ok(venueInfoService.queryByVenueCode(venueCode));
}
@@ -81,7 +81,7 @@ public class HqVenueReservationController extends BaseController {
*/
//@SaCheckPermission("hq:reservation:query")
@GetMapping("/{id}")
public R<HqVenueReservationVo> getInfo(@NotNull(message = "主键不能为空") @PathVariable Long id) {
public R<HqVenueReservationVo> 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<Void> remove(@NotEmpty(message = "主键不能为空") @PathVariable Long[] ids) {
public R<Void> 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<List<HqVenueReservationVo>> 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<HqVenueReservationVo> conflicts = reservationService.checkTimeConflict(venueId, startTime, endTime, excludeId);
return R.ok(conflicts);
}
@@ -65,7 +65,7 @@ public class JcbtPovertyApplicationController extends BaseController {
//@SaCheckPermission("jcbt:povertyApplication:query")
@GetMapping("/{id}")
@Operation(summary = "获取贫困生认定申请详细信息")
public R<JcbtPovertyApplicationVo> getInfo(@Parameter(description = "主键") @PathVariable Long id) {
public R<JcbtPovertyApplicationVo> 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<Void> remove(@Parameter(description = "主键集合") @NotEmpty(message = "主键不能为空") @PathVariable Long[] ids) {
public R<Void> 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<Void> submit(@Parameter(description = "申请ID") @PathVariable Long id) {
public R<Void> 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<Void> cancel(@Parameter(description = "申请ID") @PathVariable Long id) {
public R<Void> 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<JcbtPovertyApplicationVo> getInfoByApplicationNo(@Parameter(description = "申请编号") @PathVariable String applicationNo) {
public R<JcbtPovertyApplicationVo> 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<Boolean> 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<Boolean> 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<Map<String, Object>> statistics(@Parameter(description = "班主任ID") @RequestParam(required = false) Long teacherId) {
public R<Map<String, Object>> statistics(@Parameter(description = "班主任ID") @RequestParam(value = "teacherId", required = false) Long teacherId) {
List<JcbtPovertyApplicationVo> 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<List<Map<String, Object>>> getClassStudents(@PathVariable Long classId) {
public R<List<Map<String, Object>>> getClassStudents(@PathVariable("classId") Long classId) {
List<Map<String, Object>> students = povertyApplicationService.getClassStudents(classId);
return R.ok(students);
}
@@ -89,7 +89,7 @@ public class JcbtPovertyApplicationReviewController extends BaseController {
//@SaCheckPermission("jcbt:povertyApplication:detail")
@GetMapping("/{id}")
@Operation(summary = "获取申请详情")
public R<JcbtPovertyApplicationVo> getInfo(@Parameter(description = "申请ID") @PathVariable Long id) {
public R<JcbtPovertyApplicationVo> 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<Void> batchApprove(@Parameter(description = "申请ID列表") @RequestBody List<Long> 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<Void> batchReject(@Parameter(description = "申请ID列表") @RequestBody List<Long> 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<Map<String, Object>> statistics(@Parameter(description = "学年") @RequestParam(required = false) String academicYear,
@Parameter(description = "学院ID") @RequestParam(required = false) Long collegeId) {
public R<Map<String, Object>> statistics(@Parameter(description = "学年") @RequestParam(value = "academicYear", required = false) String academicYear,
@Parameter(description = "学院ID") @RequestParam(value = "collegeId", required = false) Long collegeId) {
List<JcbtPovertyApplicationVo> statisticsList = povertyApplicationService.getReviewStatistics(academicYear, collegeId);
// 转换为前端需要的格式
@@ -185,8 +185,8 @@ public class JcbtPovertyApplicationReviewController extends BaseController {
//@SaCheckPermission("jcbt:povertyApplication:statistics")
@GetMapping("/workloadStatistics")
@Operation(summary = "获取审核工作量统计")
public R<List<Map<String, Object>>> workloadStatistics(@Parameter(description = "开始时间") @RequestParam(required = false) String startTime,
@Parameter(description = "结束时间") @RequestParam(required = false) String endTime) {
public R<List<Map<String, Object>>> workloadStatistics(@Parameter(description = "开始时间") @RequestParam(value = "startTime", required = false) String startTime,
@Parameter(description = "结束时间") @RequestParam(value = "endTime", required = false) String endTime) {
List<Map<String, Object>> 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<Map<String, Object>> getAttachments(@Parameter(description = "申请ID") @PathVariable Long id) {
public R<Map<String, Object>> 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<List<Map<String, Object>>> getAuditHistory(@Parameter(description = "申请ID") @PathVariable Long id) {
public R<List<Map<String, Object>>> getAuditHistory(@Parameter(description = "申请ID") @PathVariable("id") Long id) {
List<Map<String, Object>> history = povertyApplicationService.getApplicationAuditHistory(id);
return R.ok(history);
}
@@ -66,7 +66,7 @@ public class JcbtScholarshipApplicationController extends BaseController {
//@SaCheckPermission("jcbt:scholarshipApplication:query")
@GetMapping("/{id}")
@Operation(summary = "获取奖学金申请记录详细信息")
public R<JcbtScholarshipApplicationVo> getInfo(@Parameter(description = "主键") @PathVariable Long id) {
public R<JcbtScholarshipApplicationVo> 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<Void> remove(@Parameter(description = "主键串") @PathVariable Long[] ids) {
public R<Void> 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<List<Map<String, Object>>> getAvailableScholarshipTypes(@Parameter(description = "班级ID") @RequestParam Long classId,
@Parameter(description = "批次ID") @RequestParam Long batchId) {
public R<List<Map<String, Object>>> 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<List<JcbtScholarshipApplicationVo>> getMyApplications(@Parameter(description = "申请人ID") @RequestParam Long applicantId,
@Parameter(description = "批次ID") @RequestParam(required = false) Long batchId) {
public R<List<JcbtScholarshipApplicationVo>> 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<List<JcbtScholarshipApplicationVo>> getPendingApplications(@Parameter(description = "审核人ID") @RequestParam(required = false) Long reviewerId,
@Parameter(description = "申请状态") @RequestParam(required = false) String status) {
public R<List<JcbtScholarshipApplicationVo>> 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<Map<String, Object>> checkStudentEligibility(@Parameter(description = "学生ID") @RequestParam Long studentId,
@Parameter(description = "批次ID") @RequestParam Long batchId,
@Parameter(description = "奖学金类型ID") @RequestParam Long scholarshipTypeId) {
public R<Map<String, Object>> 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<Void> batchApprove(@Parameter(description = "申请ID列表") @RequestBody @NotEmpty List<Long> 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<Map<String, Object>> getStatistics(@Parameter(description = "批次ID") @RequestParam(required = false) Long batchId,
@Parameter(description = "学院ID") @RequestParam(required = false) Long deptId) {
public R<Map<String, Object>> 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<Void> batchSubmitByTeacher(@Parameter(description = "批次ID") @RequestParam Long batchId,
@Parameter(description = "奖学金类型ID") @RequestParam Long scholarshipTypeId,
@Parameter(description = "班级ID") @RequestParam Long classId,
public R<Void> 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<JcbtScholarshipApplicationBo> 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<Void> 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<Map<String, Object>> getClassQuotaUsage(@Parameter(description = "班级ID") @RequestParam Long classId,
@Parameter(description = "批次ID") @RequestParam Long batchId) {
public R<Map<String, Object>> 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<Map<String, Object>> getClassInfoByTeacher(@Parameter(description = "班主任ID") @RequestParam Long teacherId) {
public R<Map<String, Object>> 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<List<Map<String, Object>>> getClassStudents(@Parameter(description = "班级ID") @RequestParam Long classId) {
public R<List<Map<String, Object>>> 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<List<Map<String, Object>>> getScholarshipTypesByBatch(@Parameter(description = "批次ID") @RequestParam Long batchId) {
public R<List<Map<String, Object>>> 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<List<Map<String, Object>>> 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<Map<String, Object>> confirmClassSelection(@Parameter(description = "班主任ID") @RequestParam Long teacherId,
@Parameter(description = "班级ID") @RequestParam Long classId) {
public R<Map<String, Object>> 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<Map<String, Object>> testScholarshipTypesStructure(@Parameter(description = "批次ID") @RequestParam Long batchId,
@Parameter(description = "班级ID") @RequestParam(required = false) Long classId) {
public R<Map<String, Object>> testScholarshipTypesStructure(@Parameter(description = "批次ID") @RequestParam("batchId") Long batchId,
@Parameter(description = "班级ID") @RequestParam(value = "classId", required = false) Long classId) {
Map<String, Object> 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<Map<String, Object>> debugSqlLogs(@Parameter(description = "批次ID") @RequestParam Long batchId,
@Parameter(description = "班级ID") @RequestParam Long classId,
@Parameter(description = "奖学金类型ID(可选,测试单个类型)") @RequestParam(required = false) Long scholarshipTypeId) {
public R<Map<String, Object>> 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<String, Object> result = new HashMap<>();
try {
@@ -64,7 +64,7 @@ public class JcbtScholarshipBatchController extends BaseController {
//@SaCheckPermission("jcbt:scholarshipBatch:query")
@GetMapping("/{id}")
public R<JcbtScholarshipBatchVo> 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<Void> 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<JcbtScholarshipBatchVo> getByBatchCode(@PathVariable String batchCode) {
public R<JcbtScholarshipBatchVo> 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<List<JcbtScholarshipBatchVo>> 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<Boolean> checkBatchCodeUnique(@RequestParam String batchCode,
@RequestParam(required = false) Long id) {
public R<Boolean> 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<Void> changeStatus(@RequestParam Long id, @RequestParam String status) {
public R<Void> 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<List<JcbtScholarshipBatchVo>> getByStatus(@PathVariable String status) {
public R<List<JcbtScholarshipBatchVo>> getByStatus(@PathVariable("status") String status) {
return R.ok(scholarshipBatchService.queryByStatus(status));
}
@@ -52,7 +52,7 @@ public class JcbtScholarshipQuotaController extends BaseController {
*/
//@SaCheckPermission("jcbt:scholarshipQuota:list")
@GetMapping("/listByBatch/{batchId}")
public R<List<JcbtScholarshipQuotaVo>> listByBatch(@PathVariable Long batchId) {
public R<List<JcbtScholarshipQuotaVo>> listByBatch(@PathVariable("batchId") Long batchId) {
List<JcbtScholarshipQuotaVo> 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<List<JcbtScholarshipQuotaVo>> listByBatchAndType(@RequestParam Long batchId,
@RequestParam Long scholarshipTypeId) {
public R<List<JcbtScholarshipQuotaVo>> listByBatchAndType(@RequestParam("batchId") Long batchId,
@RequestParam("scholarshipTypeId") Long scholarshipTypeId) {
List<JcbtScholarshipQuotaVo> 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<List<JcbtScholarshipQuotaVo>> tree(@RequestParam Long batchId,
@RequestParam Long scholarshipTypeId) {
public R<List<JcbtScholarshipQuotaVo>> tree(@RequestParam("batchId") Long batchId,
@RequestParam("scholarshipTypeId") Long scholarshipTypeId) {
List<JcbtScholarshipQuotaVo> 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<Map<String, Object>> statistics(@PathVariable Long batchId) {
public R<Map<String, Object>> statistics(@PathVariable("batchId") Long batchId) {
Map<String, Object> 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<JcbtScholarshipQuotaVo> getInfo(@NotNull(message = "主键不能为空") @PathVariable Long id) {
public R<JcbtScholarshipQuotaVo> 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<Void> remove(@NotEmpty(message = "主键不能为空") @PathVariable Long[] ids) {
public R<Void> 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<Void> clearQuotaByBatchAndType(@RequestParam Long batchId,
@RequestParam(required = false) Long scholarshipTypeId) {
public R<Void> 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<Void> batchAllocate(@RequestParam Long batchId,
@RequestParam Long scholarshipTypeId,
public R<Void> batchAllocate(@RequestParam("batchId") Long batchId,
@RequestParam("scholarshipTypeId") Long scholarshipTypeId,
@RequestBody List<JcbtScholarshipQuotaBo> 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<Void> adjustQuota(@RequestParam Long fromQuotaId,
@RequestParam Long toQuotaId,
@RequestParam Integer adjustAmount,
@RequestParam String reason) {
public R<Void> 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<Void> lockQuota(@PathVariable Long id, @RequestParam Integer isLocked) {
public R<Void> 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<Void> autoAllocate(@RequestParam Long batchId,
@RequestParam Long scholarshipTypeId,
@RequestParam String allocationRule) {
public R<Void> 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<Void> copyQuota(@RequestParam Long sourceBatchId,
@RequestParam Long targetBatchId,
public R<Void> copyQuota(@RequestParam("sourceBatchId") Long sourceBatchId,
@RequestParam("targetBatchId") Long targetBatchId,
@RequestBody List<Long> 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<Void> updateUsage(@PathVariable Long id, @RequestParam Integer usedChange) {
public R<Void> updateUsage(@PathVariable("id") Long id, @RequestParam("usedChange") Integer usedChange) {
return toAjax(scholarshipQuotaService.updateQuotaUsage(id, usedChange));
}
@@ -64,7 +64,7 @@ public class JcbtScholarshipReviewController extends BaseController {
//@SaCheckPermission("jcbt:review:query")
@GetMapping("/{id}")
public R<JcbtScholarshipReviewVo> 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<List<JcbtScholarshipReviewVo>> 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<JcbtScholarshipReviewVo> 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<JcbtScholarshipReviewVo> 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<Void> 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<Void> batchReview(
@NotEmpty(message = "审核记录ID列表不能为空") @RequestParam List<Long> 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<Long> 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<Void> 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<Void> 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<JcbtScholarshipReviewVo> 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<JcbtScholarshipReviewVo> 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<Map<String, Long>> 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<List<Long>> 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<Void> 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<Boolean> 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<Map<String, Object>> 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));
}
@@ -70,7 +70,7 @@ public class JcbtScholarshipTypeController extends BaseController {
//@SaCheckPermission("jcbt:scholarshipType:query")
@GetMapping("/{id}")
public R<JcbtScholarshipTypeVo> 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<Void> 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<JcbtScholarshipTypeVo> getByTypeName(@PathVariable String typeName) {
public R<JcbtScholarshipTypeVo> 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<List<JcbtScholarshipTypeVo>> getByCategory(@PathVariable String typeCategory) {
public R<List<JcbtScholarshipTypeVo>> 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<Boolean> checkTypeNameUnique(@RequestParam String typeName,
@RequestParam(required = false) Long id) {
public R<Boolean> 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<List<JcbtScholarshipTypeVo>> getByCompatibilityType(@PathVariable String compatibilityType) {
public R<List<JcbtScholarshipTypeVo>> 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<Void> changeStatus(@RequestParam Long id, @RequestParam Integer status) {
public R<Void> 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<Map<String, Object>> getCompatibilityConfig(@NotNull(message = "主键不能为空") @PathVariable Long id) {
public R<Map<String, Object>> getCompatibilityConfig(@NotNull(message = "主键不能为空") @PathVariable("id") Long id) {
// 获取所有启用的奖学金类型(除了当前奖学金)
List<JcbtScholarshipTypeVo> 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<Void> saveCompatibilityConfig(@NotNull(message = "主键不能为空") @PathVariable Long id,
public R<Void> saveCompatibilityConfig(@NotNull(message = "主键不能为空") @PathVariable("id") Long id,
@RequestBody Map<String, Object> config) {
// 安全地转换互斥类型ID列表,支持前端传递的字符串或数字类型
@SuppressWarnings("unchecked")
@@ -272,7 +272,7 @@ public class JcbtScholarshipTypeController extends BaseController {
*/
//@SaCheckPermission("jcbt:scholarshipType:query")
@GetMapping("/checkCompatibility")
public R<Boolean> checkCompatibility(@RequestParam Long typeId1, @RequestParam Long typeId2) {
public R<Boolean> 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<List<JcbtScholarshipTypeVo>> getCompatibleTypes(@NotNull(message = "主键不能为空") @PathVariable Long id) {
public R<List<JcbtScholarshipTypeVo>> getCompatibleTypes(@NotNull(message = "主键不能为空") @PathVariable("id") Long id) {
List<Long> compatibleTypeIds = compatibilityService.getCompatibleTypeIds(id);
List<JcbtScholarshipTypeVo> compatibleTypes = new ArrayList<>();
@@ -300,7 +300,7 @@ public class JcbtScholarshipTypeController extends BaseController {
*/
//@SaCheckPermission("jcbt:scholarshipType:query")
@GetMapping("/{id}/exclusiveRelationDisplay")
public R<String> getExclusiveRelationDisplay(@NotNull(message = "主键不能为空") @PathVariable Long id) {
public R<String> getExclusiveRelationDisplay(@NotNull(message = "主键不能为空") @PathVariable("id") Long id) {
return R.ok(scholarshipTypeService.getExclusiveRelationDisplay(id));
}
@@ -110,7 +110,7 @@ public class JcbtWorkStudyApplicationCollegeReviewController extends BaseControl
@Operation(summary = "获取本学院申请详情")
//@SaCheckPermission("jcbt:workStudyApplication:collegeReview")
@GetMapping("/{id}")
public R<JcbtWorkStudyApplicationVo> getInfo(@PathVariable Long id) {
public R<JcbtWorkStudyApplicationVo> getInfo(@PathVariable("id") Long id) {
// 获取申请信息
JcbtWorkStudyApplicationVo vo = workStudyApplicationService.queryById(id);
if (vo == null) {
@@ -174,7 +174,7 @@ public class JcbtWorkStudyApplicationCollegeReviewController extends BaseControl
public R<Void> batchReview(
@Parameter(description = "申请ID列表") @RequestBody @NotEmpty(message = "申请ID不能为空") Collection<Long> ids,
@Parameter(description = "审核结果") @RequestParam @NotNull(message = "审核结果不能为空") String reviewResult,
@Parameter(description = "审核意见") @RequestParam String reviewComment) {
@Parameter(description = "审核意见") @RequestParam("reviewComment") String reviewComment) {
// 权限检查:批量审核前检查所有申请是否属于当前用户学院
Long currentUserCollegeId = getCurrentUserCollegeIdAsLong();
@@ -69,7 +69,7 @@ public class JcbtWorkStudyApplicationController extends BaseController {
@Operation(summary = "获取勤工俭学申请信息详细信息")
// @SaCheckPermission("jcbt:workStudyApplication:query") // 暂时注释权限检查,用于测试
@GetMapping("/detail/{id}")
public R<JcbtWorkStudyApplicationVo> getInfo(@NotNull(message = "主键不能为空") @PathVariable Long id) {
public R<JcbtWorkStudyApplicationVo> 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<Void> remove(@NotEmpty(message = "主键不能为空") @PathVariable Long[] ids) {
public R<Void> 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<Map<String, Object>> debugQuery(@PathVariable Long id) {
public R<Map<String, Object>> debugQuery(@PathVariable("id") Long id) {
log.info("调试查询接口,ID: {}", id);
Map<String, Object> result = new HashMap<>();
@@ -203,7 +203,7 @@ public class JcbtWorkStudyApplicationController extends BaseController {
@Operation(summary = "获取岗位申请统计信息")
//@SaCheckPermission("jcbt:workStudyApplication:statistics")
@GetMapping("/statistics/{positionId}")
public R<Map<String, Object>> getStatistics(@PathVariable Long positionId) {
public R<Map<String, Object>> 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<Void> submitApplication(@PathVariable Long id) {
public R<Void> 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<Void> cancelApplication(@PathVariable Long id) {
public R<Void> cancelApplication(@PathVariable("id") Long id) {
return toAjax(workStudyApplicationService.cancelApplication(id));
}
@@ -263,7 +263,7 @@ public class JcbtWorkStudyApplicationController extends BaseController {
public R<Void> batchCollegeReview(
@RequestParam @NotEmpty(message = "申请ID不能为空") List<Long> 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<Void> batchFinalReview(
@RequestParam @NotEmpty(message = "申请ID不能为空") List<Long> 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<Boolean> hasApplied(@RequestParam Long studentId, @RequestParam Long positionId) {
public R<Boolean> hasApplied(@RequestParam("studentId") Long studentId, @RequestParam("positionId") Long positionId) {
return R.ok(workStudyApplicationService.hasApplied(studentId, positionId));
}
@@ -84,7 +84,7 @@ public class JcbtWorkStudyApplicationStudentAffairsReviewController extends Base
@Operation(summary = "获取勤工俭学申请详情")
//@SaCheckPermission("jcbt:workStudyApplication:studentAffairsReview")
@GetMapping("/{id}")
public R<JcbtWorkStudyApplicationVo> getInfo(@Parameter(description = "主键") @PathVariable Long id) {
public R<JcbtWorkStudyApplicationVo> 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<Void> batchReview(
@Parameter(description = "申请ID集合") @RequestParam @NotEmpty List<Long> 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)) {
@@ -72,7 +72,7 @@ public class JcbtWorkStudyPositionController extends BaseController {
@GetMapping("/{id}")
public R<JcbtWorkStudyPositionVo> 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<Map<String, Object>> 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<Void> 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<Boolean> 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<Map<String, Object>> statistics(@Parameter(description = "学院ID") @RequestParam(required = false) Long collegeId) {
public R<Map<String, Object>> 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<Void> 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<Void> 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<Void> 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<Void> 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<List<Map<String, Object>>> countByStatus(@Parameter(description = "学院ID") @RequestParam(required = false) Long collegeId) {
public R<List<Map<String, Object>>> 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<JcbtWorkStudyPositionVo> queryByStatus(@RequestParam String status, PageQuery pageQuery) {
public TableDataInfo<JcbtWorkStudyPositionVo> 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<JcbtWorkStudyPositionVo> queryByScope(@RequestParam String positionScope, PageQuery pageQuery) {
public TableDataInfo<JcbtWorkStudyPositionVo> queryByScope(@RequestParam("positionScope") String positionScope, PageQuery pageQuery) {
return workStudyPositionService.queryByPositionScope(positionScope, pageQuery);
}
@@ -194,7 +194,7 @@ public class RsApplicationController extends BaseController {
@SaCheckPermission("rs:application:edit")
@Log(title = "上传应聘附件", businessType = BusinessType.UPDATE)
@PostMapping("/attachment/{applicationId}")
public R<Map<String, String>> uploadAttachment(@PathVariable Long applicationId, @RequestParam("file") MultipartFile file) throws IOException {
public R<Map<String, String>> 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<Void> remove(@PathVariable Long[] applicationIds) {
public R<Void> remove(@PathVariable("applicationIds") Long[] applicationIds) {
return toAjax(applicationService.deleteRsApplicationByIds(applicationIds));
}
}
@@ -131,7 +131,7 @@ public class RsJobController extends BaseController {
@SaCheckPermission("rs:job:edit")
@Log(title = "切换职位状态", businessType = BusinessType.UPDATE)
@PutMapping("/toggle/{jobId}")
public R<Void> toggleStatus(@PathVariable Long jobId) {
public R<Void> 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<Void> incrementViewCount(@PathVariable Long jobId) {
public R<Void> 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<Void> remove(@PathVariable Long[] jobIds) {
public R<Void> remove(@PathVariable("jobIds") Long[] jobIds) {
return toAjax(jobService.deleteRsJobByIds(jobIds));
}
}
@@ -38,7 +38,7 @@ public class RsOverseasApplicationAttachmentController extends BaseController {
@SaCheckPermission("rs:overseas:query")
@GetMapping("/list/{applicationId}")
public R<List<RsOverseasApplicationAttachmentVo>> list(
@NotNull(message = "申请ID不能为空") @PathVariable Long applicationId) {
@NotNull(message = "申请ID不能为空") @PathVariable("applicationId") Long applicationId) {
List<RsOverseasApplicationAttachmentVo> 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<RsOverseasApplicationAttachmentVo> 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<RsOverseasApplicationAttachmentVo> 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<Void> remove(@NotNull(message = "附件ID不能为空") @PathVariable Long attachmentId) {
public R<Void> remove(@NotNull(message = "附件ID不能为空") @PathVariable("attachmentId") Long attachmentId) {
boolean success = attachmentService.deleteAttachment(attachmentId);
return toAjax(success);
}
@@ -150,7 +150,7 @@ public class RsOverseasApplicationController extends BaseController {
*/
// @SaCheckPermission("rs:overseas:list")
@GetMapping("/status/{status}")
public R<List<RsOverseasApplicationVo>> listByStatus(@PathVariable String status) {
public R<List<RsOverseasApplicationVo>> listByStatus(@PathVariable("status") String status) {
List<RsOverseasApplicationVo> 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<RsOverseasApplicationVo> getInfo(@NotNull(message = "主键不能为空") @PathVariable Long applicationId) {
public R<RsOverseasApplicationVo> 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<Long> getDepartmentApproverId(@PathVariable Long applicationId) {
public R<Long> 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<Void> submit(@NotNull(message = "申请ID不能为空") @PathVariable Long applicationId) {
public R<Void> 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<Void> resubmit(@NotNull(message = "申请ID不能为空") @PathVariable Long applicationId,
public R<Void> 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<java.util.Map<String, Object>> 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<String, Object> 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<Void> cancel(@NotNull(message = "申请ID不能为空") @PathVariable Long applicationId,
@RequestParam(required = false) String reason) {
public R<Void> 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<Void> remove(@NotEmpty(message = "主键集合不能为空") @PathVariable List<Long> applicationIds) {
public R<Void> remove(@NotEmpty(message = "主键集合不能为空") @PathVariable("applicationIds") List<Long> 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<Long> getDepartmentApproverByApplicant(@PathVariable Long applicantId) {
public R<Long> 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<List<Long>> getHrApprovers(@PathVariable Long applicantId) {
public R<List<Long>> getHrApprovers(@PathVariable("applicantId") Long applicantId) {
List<Long> 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) {
@@ -117,7 +117,7 @@ public class RsOverseasApprovalController extends BaseController {
*/
// @SaCheckPermission("rs:overseas:query")
@GetMapping("/application/{applicationId}")
public R<List<RsOverseasApprovalVo>> getByApplicationId(@PathVariable Long applicationId) {
public R<List<RsOverseasApprovalVo>> getByApplicationId(@PathVariable("applicationId") Long applicationId) {
List<RsOverseasApprovalVo> 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<RsOverseasApprovalVo> getInfo(@NotNull(message = "主键不能为空") @PathVariable Long approvalId) {
public R<RsOverseasApprovalVo> 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<Void> remove(@NotEmpty(message = "主键集合不能为空") @PathVariable List<Long> approvalIds) {
public R<Void> remove(@NotEmpty(message = "主键集合不能为空") @PathVariable("approvalIds") List<Long> approvalIds) {
return toAjax(approvalService.deleteWithValidByIds(approvalIds, true));
}
@@ -76,7 +76,7 @@ public class RsOverseasItineraryChangeController extends BaseController {
*/
// @SaCheckPermission("rs:itineraryChange:query")
@GetMapping("/{changeId}")
public R<RsOverseasItineraryChangeVo> getInfo(@PathVariable Long changeId) {
public R<RsOverseasItineraryChangeVo> 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<RsOverseasRecordVo> getRecordInfo(@PathVariable Long recordId) {
public R<RsOverseasRecordVo> 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<Void> remove(@NotEmpty(message = "主键不能为空") @PathVariable Long[] changeIds) {
public R<Void> 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<Void> cancel(@PathVariable Long changeId) {
public R<Void> 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<List<RsOverseasItineraryChangeVo>> getChangeHistory(@PathVariable Long recordId) {
public R<List<RsOverseasItineraryChangeVo>> getChangeHistory(@PathVariable("recordId") Long recordId) {
return R.ok(changeService.queryByRecordId(recordId));
}
}
@@ -88,7 +88,7 @@ public class RsOverseasRecordController extends BaseController {
*/
// @SaCheckPermission("rs:overseas:query")
@GetMapping("/application/{applicationId}")
public R<RsOverseasRecordVo> getByApplicationId(@PathVariable Long applicationId) {
public R<RsOverseasRecordVo> 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<RsOverseasRecordVo> getInfo(@NotNull(message = "主键不能为空") @PathVariable Long recordId) {
public R<RsOverseasRecordVo> 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<Void> createFromApplication(@NotNull(message = "申请ID不能为空") @PathVariable Long applicationId) {
public R<Void> 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<Void> remove(@NotEmpty(message = "主键集合不能为空") @PathVariable List<Long> recordIds) {
public R<Void> remove(@NotEmpty(message = "主键集合不能为空") @PathVariable("recordIds") List<Long> 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 {
// 查询出国记录详情
@@ -78,7 +78,7 @@ public class RsOverseasRegistrationController extends BaseController {
*/
// @SaCheckPermission("rs:overseasregistration:query")
@GetMapping("/{registrationId}")
public R<RsOverseasRegistrationVo> getInfo(@NotNull(message = "主键不能为空") @PathVariable Long registrationId) {
public R<RsOverseasRegistrationVo> 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<RsOverseasRegistrationVo> 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<Void> remove(@NotEmpty(message = "主键不能为空") @PathVariable Long[] registrationIds) {
public R<Void> 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<Void> submit(@NotNull(message = "主键不能为空") @PathVariable Long registrationId) {
public R<Void> 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<Void> confirm(@NotNull(message = "主键不能为空") @PathVariable Long registrationId) {
public R<Void> 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<Void> withdraw(@NotNull(message = "主键不能为空") @PathVariable Long registrationId) {
public R<Void> 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<Void> createFromApplication(@NotNull(message = "申请ID不能为空") @PathVariable Long applicationId) {
public R<Void> 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<Void> approve(@NotNull(message = "主键不能为空") @PathVariable Long registrationId,
public R<Void> 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<Void> reject(@NotNull(message = "主键不能为空") @PathVariable Long registrationId,
public R<Void> 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));
@@ -147,7 +147,7 @@ public class RsStaffInfoController extends BaseController {
*/
// @SaCheckPermission("rs:staffInfo:query")
@GetMapping("/{id}")
public R<RsStaffInfoVo> getInfo(@NotNull(message = "主键不能为空") @PathVariable Long id) {
public R<RsStaffInfoVo> 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<Void> remove(@NotEmpty(message = "主键不能为空") @PathVariable Long[] ids) {
public R<Void> remove(@NotEmpty(message = "主键不能为空") @PathVariable("ids") Long[] ids) {
return toAjax(staffInfoService.deleteWithRelatedData(java.util.Arrays.asList(ids)));
}
@@ -243,7 +243,7 @@ public class RsTrainingApplicationController extends BaseController {
// @SaCheckPermission("rs:trainingapplication:remove")
@Log(title = "培训申请", businessType = BusinessType.DELETE)
@DeleteMapping("/{applicationIds}")
public R<Void> remove(@PathVariable Long[] applicationIds) {
public R<Void> 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<List<SysUserBasicVo>> batchQueryCompanions(@RequestParam String userIds) {
public R<List<SysUserBasicVo>> batchQueryCompanions(@RequestParam("userIds") String userIds) {
log.info("批量查询同行人信息,用户ID列表: {}", userIds);
// 参数验证
@@ -94,7 +94,7 @@ public class RsTrainingApprovalController extends BaseController {
// @SaCheckPermission("rs:trainingapproval:remove")
@Log(title = "培训审批", businessType = BusinessType.DELETE)
@DeleteMapping("/{approvalIds}")
public R<Void> remove(@PathVariable Long[] approvalIds) {
public R<Void> remove(@PathVariable("approvalIds") Long[] approvalIds) {
return toAjax(trainingApprovalService.deleteRsTrainingApprovalByIds(approvalIds));
}
@@ -57,7 +57,7 @@ public class RsTrainingRecordController extends BaseController {
*/
// @SaCheckPermission("rs:trainingrecord:list")
@GetMapping("/test-location")
public R<List<RsTrainingRecord>> testLocationSearch(@RequestParam String location) {
public R<List<RsTrainingRecord>> 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<Void> remove(@PathVariable Long[] recordIds) {
public R<Void> 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<Map<String, String>> uploadCertificateFile(@PathVariable Long recordId,
public R<Map<String, String>> 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<Void> updateAttachments(@PathVariable Long recordId, @RequestBody Map<String, String> params) {
public R<Void> updateAttachments(@PathVariable("recordId") Long recordId, @RequestBody Map<String, String> params) {
String attachmentIds = params.get("attachmentIds");
return toAjax(trainingRecordService.updateAttachments(recordId, attachmentIds));
}
@@ -64,7 +64,7 @@ public class StglActivityAttendanceController extends BaseController {
//@SaCheckPermission("stgl:activityAttendance:query")
@GetMapping("/{id}")
public R<StglActivityAttendanceVo> 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<Void> 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<StglActivityAttendanceVo> getByActivityAndUser(@RequestParam Long activityId) {
public R<StglActivityAttendanceVo> getByActivityAndUser(@RequestParam("activityId") Long activityId) {
Long userId = LoginHelper.getUserId();
return R.ok(stglActivityAttendanceService.queryByActivityAndUser(activityId, userId));
}
@@ -40,7 +40,7 @@ public class StglActivityAuditController extends BaseController {
//@SaCheckPermission("stgl:activity:query")
@GetMapping("/{id}")
public R<StglActivityAudit> 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<List<StglActivityAuditVo>> 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<List<StglActivityAudit>> 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<Void> remove(@NotEmpty(message = "主键不能为空")
@PathVariable Long[] ids) {
@PathVariable("ids") Long[] ids) {
return toAjax(stglActivityAuditService.deleteWithValidByIds(List.of(ids), true));
}
@@ -64,7 +64,7 @@ public class StglActivityController extends BaseController {
*/
//@SaCheckPermission("stgl:activity:query")
@GetMapping("/{id}")
public R<StglActivityVo> getInfo(@NotNull(message = "主键不能为空") @PathVariable Long id) {
public R<StglActivityVo> 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<Void> remove(@NotEmpty(message = "主键不能为空") @PathVariable Long[] ids) {
public R<Void> 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<List<ActivityRatingVo>> getActivityRatings(@NotNull(message = "活动ID不能为空") @PathVariable Long id) {
public R<List<ActivityRatingVo>> getActivityRatings(@NotNull(message = "活动ID不能为空") @PathVariable("id") Long id) {
return R.ok(stglActivityService.getActivityRatings(id));
}
@@ -63,7 +63,7 @@ public class StglActivityRegisterController extends BaseController {
*/
//@SaCheckPermission("stgl:activityRegister:query")
@GetMapping("/{id}")
public R<StglActivityRegistrationVo> getInfo(@NotNull(message = "主键不能为空") @PathVariable Long id) {
public R<StglActivityRegistrationVo> 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<Void> remove(@NotEmpty(message = "主键不能为空") @PathVariable Long[] ids) {
public R<Void> 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<Void> approve(@NotNull(message = "主键不能为空") @PathVariable Long id,
@RequestParam Integer approvalStatus,
@RequestParam(required = false) String approvalRemark) {
public R<Void> 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<Void> recordScore(@NotNull(message = "主键不能为空") @PathVariable Long id,
@RequestParam String score) {
public R<Void> recordScore(@NotNull(message = "主键不能为空") @PathVariable("id") Long id,
@RequestParam("score") String score) {
return toAjax(stglActivityRegistrationService.inputScore(id, score));
}
}
@@ -47,7 +47,7 @@ public class StglActivityRegisterHallController extends BaseController {
* 获取活动详细信息
*/
@GetMapping("/{id}")
public R<StglActivityVo> getInfo(@PathVariable Long id) {
public R<StglActivityVo> 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<Boolean> checkRegistration(@PathVariable Long activityId) {
public R<Boolean> checkRegistration(@PathVariable("activityId") Long activityId) {
Long userId = LoginHelper.getUserId();
boolean isRegistered = stglActivityRegistrationService.checkUserRegistration(activityId, userId);
return R.ok(isRegistered);
@@ -62,7 +62,7 @@ public class StglActivityRegistrationController extends BaseController {
*/
//@SaCheckPermission("stgl:activityregistration:query")
@GetMapping("/{id}")
public R<StglActivityRegistrationVo> getInfo(@NotNull(message = "主键不能为空") @PathVariable Long id) {
public R<StglActivityRegistrationVo> 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<Void> remove(@NotEmpty(message = "主键不能为空") @PathVariable Long[] ids) {
public R<Void> 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<Void> approval(@RequestParam Long id,
@RequestParam String approvalStatus,
@RequestParam(required = false) String approvalRemark) {
public R<Void> 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<Void> inputScore(@RequestParam Long id, @RequestParam String score) {
public R<Void> 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<Boolean> checkRegistered(@RequestParam Long activityId, @RequestParam(required = false) Long userId) {
public R<Boolean> 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<StglActivityRegistrationVo> getUserRegistration(@RequestParam Long activityId, @RequestParam(required = false) Long userId) {
public R<StglActivityRegistrationVo> 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));
}
@@ -61,7 +61,7 @@ public class StglActivityTeamInfoController extends BaseController {
*/
//@SaCheckPermission("stgl:activityteaminfo:query")
@GetMapping("/{id}")
public R<StglActivityTeamInfoVo> getInfo(@NotNull(message = "主键不能为空") @PathVariable Long id) {
public R<StglActivityTeamInfoVo> 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<Void> remove(@NotEmpty(message = "主键不能为空") @PathVariable Long[] ids) {
public R<Void> 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<List<StglActivityTeamInfoVo>> getTeamsByActivityId(@PathVariable Long activityId) {
public R<List<StglActivityTeamInfoVo>> getTeamsByActivityId(@PathVariable("activityId") Long activityId) {
return R.ok(stglActivityTeamInfoService.queryByActivityId(activityId));
}
}
@@ -43,7 +43,7 @@ public class StglAnnualReviewAuditController extends BaseController {
//@SaCheckPermission("stgl:annualReviewAudit:query")
@GetMapping("/{id}")
public R<StglAnnualReviewAudit> 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<List<StglAnnualReviewAudit>> 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<List<StglAnnualReviewAudit>> 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<Void> remove(@NotEmpty(message = "主键不能为空")
@PathVariable Long[] ids) {
@PathVariable("ids") Long[] ids) {
return toAjax(stglAnnualReviewAuditService.deleteWithValidByIds(List.of(ids), true));
}
@@ -65,7 +65,7 @@ public class StglAuditorController extends BaseController {
//@SaCheckPermission("stgl:auditor:query")
@GetMapping("/{id}")
public R<StglAuditorVo> 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<Void> 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<List<SysUserVo>> listUserByDeptId(@PathVariable String deptId) {
public R<List<SysUserVo>> listUserByDeptId(@PathVariable("deptId") String deptId) {
List<SysUserVo> users = sysUserService.selectUserListByDept(Long.valueOf(deptId));
return R.ok(users);
}
@@ -63,7 +63,7 @@ public class StglClassController extends BaseController {
*/
//@SaCheckPermission("stgl:stclass:query")
@GetMapping("/student/clubs/{studentId}")
public R<List<Map<String, Object>>> getStudentClubs(@NotNull(message = "学生ID不能为空") @PathVariable Long studentId) {
public R<List<Map<String, Object>>> getStudentClubs(@NotNull(message = "学生ID不能为空") @PathVariable("studentId") Long studentId) {
List<Map<String, Object>> 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<List<Map<String, Object>>> getStudentVolunteerTeams(@NotNull(message = "学生ID不能为空") @PathVariable Long studentId) {
public R<List<Map<String, Object>>> getStudentVolunteerTeams(@NotNull(message = "学生ID不能为空") @PathVariable("studentId") Long studentId) {
List<Map<String, Object>> 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<List<Map<String, Object>>> getStudentActivities(@NotNull(message = "学生ID不能为空") @PathVariable Long studentId) {
public R<List<Map<String, Object>>> getStudentActivities(@NotNull(message = "学生ID不能为空") @PathVariable("studentId") Long studentId) {
List<Map<String, Object>> list = stglClassService.getStudentActivities(studentId);
return R.ok(list);
}
@@ -69,7 +69,7 @@ public class StglClubAdvisorHistoryController extends BaseController {
@Operation(summary = "获取社团指导老师任职历史详细信息")
//@SaCheckPermission("stgl:club:query")
@GetMapping("/{id}")
public R<StglClubAdvisorHistoryVo> getInfo(@NotNull(message = "主键不能为空") @PathVariable Long id) {
public R<StglClubAdvisorHistoryVo> 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<List<StglClubAdvisorHistoryVo>> getCurrentAdvisors(@PathVariable Long clubId) {
public R<List<StglClubAdvisorHistoryVo>> getCurrentAdvisors(@PathVariable("clubId") Long clubId) {
List<StglClubAdvisorHistoryVo> 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<List<StglClubAdvisorHistoryVo>> getHistoryAdvisors(@PathVariable Long clubId) {
public R<List<StglClubAdvisorHistoryVo>> getHistoryAdvisors(@PathVariable("clubId") Long clubId) {
List<StglClubAdvisorHistoryVo> 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<List<StglClubAdvisorHistoryVo>> getAllAdvisors(@PathVariable Long clubId) {
public R<List<StglClubAdvisorHistoryVo>> getAllAdvisors(@PathVariable("clubId") Long clubId) {
List<StglClubAdvisorHistoryVo> 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<Void> remove(@NotEmpty(message = "主键不能为空") @PathVariable Long[] ids) {
public R<Void> remove(@NotEmpty(message = "主键不能为空") @PathVariable("ids") Long[] ids) {
return toAjax(stglClubAdvisorHistoryService.deleteWithValidByIds(List.of(ids), true));
}
@@ -80,7 +80,7 @@ public class StglClubAnnualReviewController extends BaseController {
//@SaCheckPermission("stgl:clubAnnualReview:query")
@GetMapping("/{id}")
public R<StglClubAnnualReviewVo> 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<Void> 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<Void> 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<Void> 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<Void> 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<List<org.dromara.stgl.domain.vo.StglClubAnnualReviewActivityVo>> getAnnualReviewActivities(
@NotNull(message = "年审记录ID不能为空") @PathVariable Long id) {
@NotNull(message = "年审记录ID不能为空") @PathVariable("id") Long id) {
return R.ok(stglClubAnnualReviewService.getAnnualReviewActivities(id));
}
@@ -71,7 +71,7 @@ public class StglClubController extends BaseController {
//@SaCheckPermission("stgl:club:query")
@GetMapping("/{id}")
public R<StglClubVo> 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<Void> 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<List<StglClubVo>> listByType(@PathVariable String clubType) {
public R<List<StglClubVo>> 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<Boolean> checkClubName(@RequestParam String clubName, @RequestParam(required = false) Long id) {
public R<Boolean> 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<Boolean> checkPresidentRole(@PathVariable Long id) {
public R<Boolean> 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<Void> transferClub(@PathVariable Long id, @RequestParam Long newPresidentUserId) {
public R<Void> 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<StglClubVo> testVicePresidentData(@PathVariable Long id) {
public R<StglClubVo> 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<Void> changeStatus(@RequestParam Long id, @RequestParam Integer status) {
public R<Void> 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<Void> changeSighOpenStatus(@RequestParam Long id, @RequestParam String sighOpen) {
public R<Void> changeSighOpenStatus(@RequestParam("id") Long id, @RequestParam("sighOpen") String sighOpen) {
return toAjax(stglClubService.changeSighOpenStatus(id, sighOpen));
}
@@ -40,7 +40,7 @@ public class StglClubPermissionController extends BaseController {
//@SaCheckPermission("stgl:club:list")
@GetMapping("/checkActivityPermission/{clubId}")
@Log(title = "检查社团活动权限", businessType = BusinessType.OTHER)
public R<ClubActivityPermissionResult> checkActivityPermission(@PathVariable Long clubId) {
public R<ClubActivityPermissionResult> 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<Boolean> isInAnnualReviewWindow(@PathVariable Long clubId) {
public R<Boolean> 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<Long> getDaysUntilNextAnnualReview(@PathVariable Long clubId) {
public R<Long> 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<Boolean> hasSubmittedCurrentYearAnnualReview(@PathVariable Long clubId) {
public R<Boolean> 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<Map<String, Object>> getPermissionDetails(@PathVariable Long clubId) {
public R<Map<String, Object>> getPermissionDetails(@PathVariable("clubId") Long clubId) {
log.info("获取社团权限详情,clubId: {}", clubId);
if (clubId == null || clubId <= 0) {
@@ -43,8 +43,8 @@ public class StglClubRegisterController extends BaseController {
@Operation(summary = "查询社团报名大厅列表")
//@SaCheckPermission("stgl:club:list")
@GetMapping("/list")
public TableDataInfo<StglClubRegisterVo> list(@RequestParam(required = false) String clubType,
@RequestParam(required = false) String clubName,
public TableDataInfo<StglClubRegisterVo> 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<List<StglClubRegisterVo>> listAll(@RequestParam(required = false) String clubType,
@RequestParam(required = false) String clubName) {
public R<List<StglClubRegisterVo>> 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<StglClubRegisterVo> getClubDetail(@PathVariable Long clubId) {
public R<StglClubRegisterVo> 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<Void> applyClub(@RequestParam Long clubId, @RequestBody StglClubApplyBo applyBo) {
public R<Void> 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<Void> quitClub(@PathVariable Long clubId) {
public R<Void> 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<Boolean> checkRegistered(@PathVariable Long clubId) {
public R<Boolean> 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<List<StglClubRegisterVo>> getRecommendClubs(@RequestParam(required = false) String clubType,
public R<List<StglClubRegisterVo>> getRecommendClubs(@RequestParam(value = "clubType", required = false) String clubType,
@RequestParam(required = false, defaultValue = "6") Integer limit) {
return R.ok(stglClubRegisterService.queryRecommendClubs(clubType, limit));
}
@@ -64,7 +64,7 @@ public class StglMaterialSubmissionController extends BaseController {
*/
//@SaCheckPermission("stgl:activitymaterial:query")
@GetMapping("/{id}")
public R<StglMaterialSubmissionVo> getInfo(@NotNull(message = "主键不能为空") @PathVariable Long id) {
public R<StglMaterialSubmissionVo> 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<Void> remove(@NotEmpty(message = "主键不能为空") @PathVariable Long[] ids) {
public R<Void> 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<List<StglMaterialSubmissionVo>> getByTaskId(@PathVariable Long taskId) {
public R<List<StglMaterialSubmissionVo>> getByTaskId(@PathVariable("taskId") Long taskId) {
List<StglMaterialSubmissionVo> 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<StglMaterialSubmissionVo> getByTaskIdAndUserId(@PathVariable Long taskId, @PathVariable Long userId) {
public R<StglMaterialSubmissionVo> 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<StglMaterialSubmissionVo> getByTaskIdAndTeamId(@PathVariable Long taskId, @PathVariable Long teamId) {
public R<StglMaterialSubmissionVo> 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<Map<String, Object>> getSubmissionStatistics(@PathVariable Long taskId) {
public R<Map<String, Object>> getSubmissionStatistics(@PathVariable("taskId") Long taskId) {
Map<String, Object> 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<Void> reviewSubmission(@PathVariable Long id,
@RequestParam Integer reviewStatus,
@RequestParam(required = false) String reviewRemark) {
public R<Void> 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<Void> batchReviewSubmissions(@RequestParam String ids,
@RequestParam Integer reviewStatus,
@RequestParam(required = false) String reviewRemark) {
public R<Void> 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(驳回)");
}
@@ -64,7 +64,7 @@ public class StglMaterialTaskController extends BaseController {
*/
//@SaCheckPermission("stgl:activitymaterial:query")
@GetMapping("/{id}")
public R<StglMaterialTaskVo> getInfo(@NotNull(message = "主键不能为空") @PathVariable Long id) {
public R<StglMaterialTaskVo> 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<Void> remove(@NotEmpty(message = "主键不能为空") @PathVariable Long[] ids) {
public R<Void> 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<Void> updateStatus(@RequestParam Long id, @RequestParam Integer taskStatus) {
public R<Void> 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<List<StglMaterialTaskVo>> getUploadableTasks(@RequestParam Long userId,
@RequestParam(required = false) Long activityId) {
public R<List<StglMaterialTaskVo>> getUploadableTasks(@RequestParam("userId") Long userId,
@RequestParam(value = "activityId", required = false) Long activityId) {
List<StglMaterialTaskVo> 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<Boolean> validateUploadPermission(@RequestParam Long taskId, @RequestParam Long userId) {
public R<Boolean> 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<List<StglMaterialTaskVo>> getTasksByActivityId(@PathVariable Long activityId) {
public R<List<StglMaterialTaskVo>> getTasksByActivityId(@PathVariable("activityId") Long activityId) {
List<StglMaterialTaskVo> 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<Void> updateStatistics(@PathVariable Long taskId) {
public R<Void> 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<List<StglMaterialTaskVo>> getActivityOptions(@RequestParam(required = false) String activityName) {
public R<List<StglMaterialTaskVo>> getActivityOptions(@RequestParam(value = "activityName", required = false) String activityName) {
List<StglMaterialTaskVo> options = materialTaskService.queryActivityOptions(activityName);
return R.ok(options);
}
@@ -88,7 +88,7 @@ public class StglMemberController extends BaseController {
@Parameter(name = "id", description = "成员ID", required = true)
})
public R<StglMemberVo> 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<Void> 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<Void> batchAddMembers(@RequestParam Integer memberType,
@RequestParam Long relationId,
@RequestParam List<Long> userIds,
@RequestParam(required = false) Integer roleType) {
public R<Void> batchAddMembers(@RequestParam("memberType") Integer memberType,
@RequestParam("relationId") Long relationId,
@RequestParam("userIds") List<Long> 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<Void> updateMemberRole(@RequestParam Long id, @RequestParam Integer roleType) {
public R<Void> 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<Void> approveMember(@PathVariable Long id, @RequestParam Boolean approved) {
public R<Void> 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<Void> quitMember(@PathVariable Long id) {
public R<Void> 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<List<StglMemberApprovalVo>> getApprovalFlow(@PathVariable Long memberId) {
public R<List<StglMemberApprovalVo>> 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<List<StglMemberApprovalVo>> getPendingApprovals(@RequestParam(required = false) Long clubId) {
public R<List<StglMemberApprovalVo>> getPendingApprovals(@RequestParam(value = "clubId", required = false) Long clubId) {
return R.ok(memberApprovalService.getPendingApprovals(clubId));
}
@@ -65,9 +65,9 @@ public class StglMyController extends BaseController {
//@SaCheckPermission("stgl:my:list")
@GetMapping("/activities")
public R<List<MyActivityVo>> 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<MyActivityVo> list = stglMyService.queryMyActivities(activityName, activityType, isRated);
return R.ok(list);
}
@@ -80,8 +80,8 @@ public class StglMyController extends BaseController {
@GetMapping("/registrations")
public TableDataInfo<MyRegistrationVo> 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);
}
@@ -77,7 +77,7 @@ public class StglVolunteerMemberController extends BaseController {
//@SaCheckPermission("stgl:volunteermember:query")
@GetMapping("/{id}")
public R<StglMemberVo> 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<Void> 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<List<StglMemberVo>> 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<Void> approveMember(@NotNull(message = "成员ID不能为空")
@PathVariable Long id,
@RequestParam Boolean approved) {
@PathVariable("id") Long id,
@RequestParam("approved") Boolean approved) {
return toAjax(stglMemberService.approveMember(id, approved));
}
}
@@ -69,7 +69,7 @@ public class StglVolunteerTeamController extends BaseController {
*/
// @SaCheckPermission("stgl:volunteerTeam:query")
@GetMapping("/{id}")
public R<StglVolunteerTeamVo> getInfo(@PathVariable Long id) {
public R<StglVolunteerTeamVo> 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<Void> remove(@PathVariable Long[] ids) {
public R<Void> 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<List<StglVolunteerTeamVo>> getByLeaderUserId(@PathVariable Long leaderUserId) {
public R<List<StglVolunteerTeamVo>> getByLeaderUserId(@PathVariable("leaderUserId") Long leaderUserId) {
List<StglVolunteerTeamVo> 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<List<StglVolunteerTeamVo>> getByTeamType(@PathVariable String teamType) {
public R<List<StglVolunteerTeamVo>> getByTeamType(@PathVariable("teamType") String teamType) {
List<StglVolunteerTeamVo> 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<Void> updateStatus(@RequestParam Long id, @RequestParam Integer status) {
public R<Void> 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<StglVolunteerTeamVo> getRegistrationInfo(@PathVariable Long id) {
public R<StglVolunteerTeamVo> 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<Boolean> checkTeamLeader(@PathVariable Long id) {
public R<Boolean> 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<Void> transferVolunteerTeam(@PathVariable Long id, @RequestParam Long newLeaderUserId) {
public R<Void> 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<Void> changeSighOpenStatus(@RequestParam Long id, @RequestParam String sighOpen) {
public R<Void> changeSighOpenStatus(@RequestParam("id") Long id, @RequestParam("sighOpen") String sighOpen) {
return toAjax(stglVolunteerTeamService.changeSighOpenStatus(id, sighOpen));
}
}
@@ -67,7 +67,7 @@ public class SysRegionController extends BaseController {
*/
//@SaCheckPermission("system:SysRegion:query")
@GetMapping("/{id}")
public R<SysRegionVo> getInfo(@NotNull(message = "主键不能为空") @PathVariable Long id) {
public R<SysRegionVo> 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<Void> remove(@NotEmpty(message = "主键不能为空") @PathVariable Long[] ids) {
public R<Void> remove(@NotEmpty(message = "主键不能为空") @PathVariable("ids") Long[] ids) {
return toAjax(sysRegionService.deleteWithValidByIds(List.of(ids), true));
}
@@ -43,7 +43,7 @@ public class SysTeacherController extends BaseController {
*/
//@SaCheckPermission("system:teacher:list")
@GetMapping("/search")
public R<List<SysTeacherVo>> searchByName(@RequestParam String name,
public R<List<SysTeacherVo>> searchByName(@RequestParam("name") String name,
@RequestParam(defaultValue = "10") Integer limit) {
List<SysTeacherVo> 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<List<SysTeacherVo>> getTeachersByDeptId(@PathVariable Long deptId) {
public R<List<SysTeacherVo>> getTeachersByDeptId(@PathVariable("deptId") Long deptId) {
List<SysTeacherVo> 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<SysTeacherVo> getInfo(@PathVariable Long userId) {
public R<SysTeacherVo> getInfo(@PathVariable("userId") Long userId) {
return R.ok(sysTeacherService.queryById(userId));
}
}
@@ -60,7 +60,7 @@ public class SysLogininforController extends BaseController {
//@SaCheckPermission("monitor:logininfor:remove")
@Log(title = "登录日志", businessType = BusinessType.DELETE)
@DeleteMapping("/{infoIds}")
public R<Void> remove(@PathVariable Long[] infoIds) {
public R<Void> remove(@PathVariable("infoIds") Long[] infoIds) {
return toAjax(logininforService.deleteLogininforByIds(infoIds));
}
@@ -58,7 +58,7 @@ public class SysOperlogController extends BaseController {
@Log(title = "操作日志", businessType = BusinessType.DELETE)
//@SaCheckPermission("monitor:operlog:remove")
@DeleteMapping("/{operIds}")
public R<Void> remove(@PathVariable Long[] operIds) {
public R<Void> remove(@PathVariable("operIds") Long[] operIds) {
return toAjax(operLogService.deleteOperLogByIds(operIds));
}
@@ -82,7 +82,7 @@ public class SysUserOnlineController extends BaseController {
//@SaCheckPermission("monitor:online:forceLogout")
@Log(title = "在线用户", businessType = BusinessType.FORCE)
@DeleteMapping("/{tokenId}")
public R<Void> forceLogout(@PathVariable String tokenId) {
public R<Void> forceLogout(@PathVariable("tokenId") String tokenId) {
try {
StpUtil.kickoutByTokenValue(tokenId);
} catch (NotLoginException ignored) {
@@ -58,7 +58,7 @@ public class SysBucketPasswordController extends BaseController {
*/
//@SaCheckPermission("system:bucket-password:query")
@GetMapping("/info/{bucketName}")
public R<Object> getBucketPasswordInfo(@PathVariable String bucketName) {
public R<Object> 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<Object> getBucketAccessRecords(
@PathVariable String bucketName,
@PathVariable("bucketName") String bucketName,
@RequestParam(defaultValue = "10") Integer limit) {
try {
@@ -64,7 +64,7 @@ public class SysClientController extends BaseController {
//@SaCheckPermission("system:client:query")
@GetMapping("/{id}")
public R<SysClientVo> 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<Void> remove(@NotEmpty(message = "主键不能为空")
@PathVariable Long[] ids) {
@PathVariable("ids") Long[] ids) {
return toAjax(sysClientService.deleteWithValidByIds(List.of(ids), true));
}
}
@@ -58,7 +58,7 @@ public class SysConfigController extends BaseController {
*/
//@SaCheckPermission("system:config:query")
@GetMapping(value = "/{configId}")
public R<SysConfigVo> getInfo(@PathVariable Long configId) {
public R<SysConfigVo> 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<String> getConfigKey(@PathVariable String configKey) {
public R<String> 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<Void> remove(@PathVariable Long[] configIds) {
public R<Void> remove(@PathVariable("configIds") Long[] configIds) {
configService.deleteConfigByIds(configIds);
return R.ok();
}
@@ -63,7 +63,7 @@ public class SysDeptController extends BaseController {
*/
//@SaCheckPermission("system:dept:query")
@GetMapping(value = "/{deptId}")
public R<SysDeptVo> getInfo(@PathVariable Long deptId) {
public R<SysDeptVo> 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<Void> remove(@PathVariable Long deptId) {
public R<Void> 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<List<SysDeptVo>> optionselect(@RequestParam(required = false) Long[] deptIds) {
public R<List<SysDeptVo>> optionselect(@RequestParam(value = "deptIds", required = false) Long[] deptIds) {
return R.ok(deptService.selectDeptByIds(deptIds == null ? null : List.of(deptIds)));
}
@@ -62,7 +62,7 @@ public class SysDictDataController extends BaseController {
*/
//@SaCheckPermission("system:dict:query")
@GetMapping(value = "/{dictCode}")
public R<SysDictDataVo> getInfo(@PathVariable Long dictCode) {
public R<SysDictDataVo> 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<List<SysDictDataVo>> dictType(@PathVariable String dictType) {
public R<List<SysDictDataVo>> dictType(@PathVariable("dictType") String dictType) {
List<SysDictDataVo> 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<Void> remove(@PathVariable Long[] dictCodes) {
public R<Void> remove(@PathVariable("dictCodes") Long[] dictCodes) {
dictDataService.deleteDictDataByIds(dictCodes);
return R.ok();
}
@@ -58,7 +58,7 @@ public class SysDictTypeController extends BaseController {
*/
//@SaCheckPermission("system:dict:query")
@GetMapping(value = "/{dictId}")
public R<SysDictTypeVo> getInfo(@PathVariable Long dictId) {
public R<SysDictTypeVo> 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<Void> remove(@PathVariable Long[] dictIds) {
public R<Void> remove(@PathVariable("dictIds") Long[] dictIds) {
dictTypeService.deleteDictTypeByIds(dictIds);
return R.ok();
}
@@ -46,8 +46,8 @@ public class SysFileAccessController extends BaseController {
*/
@GetMapping("/access/{ossId}")
public R<String> 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<Map<Long, String>> getBatchFileAccessUrl(
@RequestBody List<Long> 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<String> 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<String> 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) {
@@ -72,7 +72,7 @@ public class SysMenuController extends BaseController {
}, mode = SaMode.OR)
//@SaCheckPermission("system:menu:query")
@GetMapping(value = "/{menuId}")
public R<SysMenuVo> getInfo(@PathVariable Long menuId) {
public R<SysMenuVo> getInfo(@PathVariable("menuId") Long menuId) {
return R.ok(menuService.selectMenuById(menuId));
}
@@ -46,7 +46,7 @@ public class SysNoticeController extends BaseController {
*/
//@SaCheckPermission("system:notice:query")
@GetMapping(value = "/{noticeId}")
public R<SysNoticeVo> getInfo(@PathVariable Long noticeId) {
public R<SysNoticeVo> 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<Void> remove(@PathVariable Long[] noticeIds) {
public R<Void> remove(@PathVariable("noticeIds") Long[] noticeIds) {
return toAjax(noticeService.deleteNoticeByIds(noticeIds));
}
}
@@ -54,7 +54,7 @@ public class SysOssConfigController extends BaseController {
//@SaCheckPermission("system:ossConfig:list")
@GetMapping("/{ossConfigId}")
public R<SysOssConfigVo> 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<Void> remove(@NotEmpty(message = "主键不能为空")
@PathVariable Long[] ossConfigIds) {
@PathVariable("ossConfigIds") Long[] ossConfigIds) {
return toAjax(ossConfigService.deleteWithValidByIds(List.of(ossConfigIds), true));
}
@@ -60,7 +60,7 @@ public class SysOssController extends BaseController {
*/
//@SaCheckPermission("system:oss:query")
@GetMapping("/listByIds/{ossIds}")
public R<List<SysOssVo>> listByIds(@NotEmpty(message = "主键不能为空") @PathVariable Long[] ossIds) {
public R<List<SysOssVo>> listByIds(@NotEmpty(message = "主键不能为空") @PathVariable("ossIds") Long[] ossIds) {
List<SysOssVo> 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<Void> remove(@NotEmpty(message = "主键不能为空") @PathVariable Long[] ossIds) {
public R<Void> 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<Void> removeFromCache(@PathVariable Long ossId) {
public R<Void> removeFromCache(@PathVariable("ossId") Long ossId) {
ossService.removeFromCache(ossId);
return R.ok("文件缓存已移除");
}
@@ -61,7 +61,7 @@ public class SysPostController extends BaseController {
*/
//@SaCheckPermission("system:post:query")
@GetMapping(value = "/{postId}")
public R<SysPostVo> getInfo(@PathVariable Long postId) {
public R<SysPostVo> 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<Void> remove(@PathVariable Long[] postIds) {
public R<Void> 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<List<SysPostVo>> optionselect(@RequestParam(required = false) Long[] postIds, @RequestParam(required = false) Long deptId) {
public R<List<SysPostVo>> optionselect(@RequestParam(value = "postIds", required = false) Long[] postIds, @RequestParam(value = "deptId", required = false) Long deptId) {
List<SysPostVo> list = new ArrayList<>();
if (ObjectUtil.isNotNull(deptId)) {
SysPostBo post = new SysPostBo();
@@ -67,7 +67,7 @@ public class SysRoleController extends BaseController {
*/
//@SaCheckPermission("system:role:query")
@GetMapping(value = "/{roleId}")
public R<SysRoleVo> getInfo(@PathVariable Long roleId) {
public R<SysRoleVo> 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<Void> remove(@PathVariable Long[] roleIds) {
public R<Void> 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<List<SysRoleVo>> optionselect(@RequestParam(required = false) Long[] roleIds) {
public R<List<SysRoleVo>> 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<Void> cancelAuthUserAll(Long roleId, Long[] userIds) {
public R<Void> 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<Void> selectAuthUserAll(Long roleId, Long[] userIds) {
public R<Void> selectAuthUserAll(@RequestParam("roleId") Long roleId, @RequestParam("userIds") Long[] userIds) {
roleService.checkRoleDataScope(roleId);
return toAjax(roleService.insertAuthUsers(roleId, userIds));
}
@@ -75,7 +75,7 @@ public class SysTenantController extends BaseController {
//@SaCheckPermission("system:tenant:query")
@GetMapping("/{id}")
public R<SysTenantVo> 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<Void> 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<Void> dynamicTenant(@NotBlank(message = "租户ID不能为空") @PathVariable String tenantId) {
public R<Void> dynamicTenant(@NotBlank(message = "租户ID不能为空") @PathVariable("tenantId") String tenantId) {
TenantHelper.setDynamic(tenantId, true);
return R.ok();
}
Loaded 100 of 187 files, more files were not shown because too many files have changed in this diff. Show more