From 26f6f43785afd992496d7fc79775124e557ff16d Mon Sep 17 00:00:00 2001
From: xuhy <3313886187@qq.com>
Date: 星期二, 21 十月 2025 17:56:05 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
ruoyi-admin/src/main/java/com/ruoyi/web/controller/api/TMajorController.java | 36 ++++++++++++++++++------------------
1 files changed, 18 insertions(+), 18 deletions(-)
diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/api/TMajorController.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/api/TMajorController.java
index c50d387..38c2a80 100644
--- a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/api/TMajorController.java
+++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/api/TMajorController.java
@@ -30,11 +30,11 @@
@RequestMapping("")
public class TMajorController {
- private final TMajorService majorService;
+ private final TMajorService tMajorService;
private final TokenService tokenService;
@Autowired
- public TMajorController(TMajorService majorService, TokenService tokenService) {
- this.majorService = majorService;
+ public TMajorController(TMajorService tMajorService, TokenService tokenService) {
+ this.tMajorService = tMajorService;
this.tokenService = tokenService;
}
@@ -43,10 +43,10 @@
*/
//@PreAuthorize("@ss.hasPermi('system:major:list')")
@ApiOperation(value = "专业管理分页列表", response = TMajorQuery.class)
- @PostMapping(value = "/api/t-division-team/pageList")
+ @PostMapping(value = "/api/t-major/pageList")
public R<PageInfo<TMajor>> pageList(@RequestBody String param) {
TMajorQuery query = JSON.parseObject(param, TMajorQuery.class);
- return R.ok(majorService.pageList(query));
+ return R.ok(tMajorService.pageList(query));
}
/**
@@ -55,13 +55,13 @@
//@PreAuthorize("@ss.hasPermi('system:major:add')")
@Log(title = "专业管理信息-新增专业管理", businessType = BusinessType.INSERT)
@ApiOperation(value = "添加专业管理",response = TMajor.class)
- @PostMapping(value = "/api/t-division-team/add")
+ @PostMapping(value = "/api/t-major/add")
public R<Boolean> add(@RequestBody String param) {
TMajor dto = JSON.parseObject(param,TMajor.class);
- if(majorService.isExit(dto)){
+ if(tMajorService.isExit(dto)){
return R.fail("该专业已存在");
}
- majorService.save(dto);
+ tMajorService.save(dto);
return R.ok();
}
@@ -71,13 +71,13 @@
//@PreAuthorize("@ss.hasPermi('system:major:edit')")
@Log(title = "专业管理信息-修改专业管理", businessType = BusinessType.UPDATE)
@ApiOperation(value = "修改专业管理")
- @PostMapping(value = "/api/t-division-team/update")
+ @PostMapping(value = "/api/t-major/update")
public R<Boolean> update(@RequestBody String param) {
TMajor dto = JSON.parseObject(param,TMajor.class);
- if(majorService.isExit(dto)){
+ if(tMajorService.isExit(dto)){
return R.fail("该专业已存在");
}
- majorService.updateById(dto);
+ tMajorService.updateById(dto);
return R.ok();
}
@@ -86,9 +86,9 @@
*/
//@PreAuthorize("@ss.hasPermi('system:major:detail')")
@ApiOperation(value = "查看专业管理详情")
- @GetMapping(value = "/open/t-division-team/getDetailById")
+ @GetMapping(value = "/open/t-major/getDetailById")
public R<TMajor> getDetailById(@RequestParam String id) {
- TMajor equipment = majorService.getById(id);
+ TMajor equipment = tMajorService.getById(id);
return R.ok(equipment);
}
@@ -98,9 +98,9 @@
//@PreAuthorize("@ss.hasPermi('system:major:delete')")
@Log(title = "专业管理信息-删除专业管理", businessType = BusinessType.DELETE)
@ApiOperation(value = "删除专业管理")
- @DeleteMapping(value = "/open/t-division-team/deleteById")
- public R<Boolean> deleteById(@RequestParam String id) {
- return R.ok(majorService.removeById(id));
+ @DeleteMapping(value = "/open/t-major/deleteById/{id}")
+ public R<Boolean> deleteById(@PathVariable String id) {
+ return R.ok(tMajorService.removeById(id));
}
/**
@@ -109,9 +109,9 @@
//@PreAuthorize("@ss.hasPermi('system:major:delete')")
@Log(title = "专业管理信息-删除专业管理", businessType = BusinessType.DELETE)
@ApiOperation(value = "批量删除专业管理")
- @DeleteMapping(value = "/open/t-division-team/deleteByIds")
+ @DeleteMapping(value = "/open/t-major/deleteByIds")
public R<Boolean> deleteByIds(@RequestBody List<String> ids) {
- return R.ok(majorService.removeByIds(ids));
+ return R.ok(tMajorService.removeByIds(ids));
}
}
--
Gitblit v1.7.1