From 81e50dcfc1bbcc97298fa08cb27a91f2e4759a58 Mon Sep 17 00:00:00 2001 From: liujie <1793218484@qq.com> Date: 星期日, 28 九月 2025 17:44:01 +0800 Subject: [PATCH] Merge branch 'master' of http://120.76.84.145:10101/gitblit/r/intelligent_dispatching --- ruoyi-admin/src/main/java/com/ruoyi/web/controller/api/TMajorController.java | 104 ++++++++++++++++++++++++++++++++++++++++++++++++++- 1 files changed, 101 insertions(+), 3 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 47e2b2f..c50d387 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 @@ -1,8 +1,21 @@ package com.ruoyi.web.controller.api; -import org.springframework.web.bind.annotation.RequestMapping; -import org.springframework.web.bind.annotation.RestController; +import com.alibaba.fastjson.JSON; +import com.ruoyi.common.annotation.Log; +import com.ruoyi.common.basic.PageInfo; +import com.ruoyi.common.core.domain.R; +import com.ruoyi.common.enums.BusinessType; +import com.ruoyi.framework.web.service.TokenService; +import com.ruoyi.system.model.TMajor; +import com.ruoyi.system.query.TMajorQuery; +import com.ruoyi.system.service.TMajorService; +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiOperation; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.web.bind.annotation.*; + +import java.util.List; /** * <p> @@ -12,9 +25,94 @@ * @author xiaochen * @since 2025-09-28 */ +@Api(tags = "专业管理") @RestController -@RequestMapping("/t-major") +@RequestMapping("") public class TMajorController { + private final TMajorService majorService; + private final TokenService tokenService; + @Autowired + public TMajorController(TMajorService majorService, TokenService tokenService) { + this.majorService = majorService; + this.tokenService = tokenService; + } + + /** + * 专业管理列表 + */ + //@PreAuthorize("@ss.hasPermi('system:major:list')") + @ApiOperation(value = "专业管理分页列表", response = TMajorQuery.class) + @PostMapping(value = "/api/t-division-team/pageList") + public R<PageInfo<TMajor>> pageList(@RequestBody String param) { + TMajorQuery query = JSON.parseObject(param, TMajorQuery.class); + return R.ok(majorService.pageList(query)); + } + + /** + * 添加专业管理管理 + */ + //@PreAuthorize("@ss.hasPermi('system:major:add')") + @Log(title = "专业管理信息-新增专业管理", businessType = BusinessType.INSERT) + @ApiOperation(value = "添加专业管理",response = TMajor.class) + @PostMapping(value = "/api/t-division-team/add") + public R<Boolean> add(@RequestBody String param) { + TMajor dto = JSON.parseObject(param,TMajor.class); + if(majorService.isExit(dto)){ + return R.fail("该专业已存在"); + } + majorService.save(dto); + return R.ok(); + } + + /** + * 修改专业管理 + */ + //@PreAuthorize("@ss.hasPermi('system:major:edit')") + @Log(title = "专业管理信息-修改专业管理", businessType = BusinessType.UPDATE) + @ApiOperation(value = "修改专业管理") + @PostMapping(value = "/api/t-division-team/update") + public R<Boolean> update(@RequestBody String param) { + TMajor dto = JSON.parseObject(param,TMajor.class); + if(majorService.isExit(dto)){ + return R.fail("该专业已存在"); + } + majorService.updateById(dto); + return R.ok(); + } + + /** + * 查看专业管理详情 + */ + //@PreAuthorize("@ss.hasPermi('system:major:detail')") + @ApiOperation(value = "查看专业管理详情") + @GetMapping(value = "/open/t-division-team/getDetailById") + public R<TMajor> getDetailById(@RequestParam String id) { + TMajor equipment = majorService.getById(id); + return R.ok(equipment); + } + + /** + * 删除专业管理 + */ + //@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)); + } + + /** + * 批量删除专业管理 + */ + //@PreAuthorize("@ss.hasPermi('system:major:delete')") + @Log(title = "专业管理信息-删除专业管理", businessType = BusinessType.DELETE) + @ApiOperation(value = "批量删除专业管理") + @DeleteMapping(value = "/open/t-division-team/deleteByIds") + public R<Boolean> deleteByIds(@RequestBody List<String> ids) { + return R.ok(majorService.removeByIds(ids)); + } + } -- Gitblit v1.7.1