From f22ad73994e08da7e1f87dad7b7dec8b348a695b Mon Sep 17 00:00:00 2001 From: liujie <1793218484@qq.com> Date: 星期日, 28 九月 2025 17:13:54 +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/TEquipmentController.java | 98 +++++++++++++++++++++++++++++++++++++++++++++++- 1 files changed, 95 insertions(+), 3 deletions(-) diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/api/TEquipmentController.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/api/TEquipmentController.java index 0602083..1b6b81f 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/api/TEquipmentController.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/api/TEquipmentController.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.TEquipment; +import com.ruoyi.system.query.TEquipmentQuery; +import com.ruoyi.system.service.TEquipmentService; +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,88 @@ * @author xiaochen * @since 2025-09-28 */ +@Api(tags = "装备库管理") @RestController -@RequestMapping("/t-equipment") +@RequestMapping("") public class TEquipmentController { + private final TEquipmentService equipmentService; + private final TokenService tokenService; + @Autowired + public TEquipmentController(TEquipmentService equipmentService, TokenService tokenService) { + this.equipmentService = equipmentService; + this.tokenService = tokenService; + } + + /** + * 装备库管理列表 + */ + //@PreAuthorize("@ss.hasPermi('system:equipment:list')") + @ApiOperation(value = "装备库管理分页列表", response = TEquipmentQuery.class) + @PostMapping(value = "/api/t-equipment/pageList") + public R<PageInfo<TEquipment>> pageList(@RequestBody String param) { + TEquipmentQuery query = JSON.parseObject(param, TEquipmentQuery.class); + return R.ok(equipmentService.pageList(query)); + } + + /** + * 添加装备库管理管理 + */ + //@PreAuthorize("@ss.hasPermi('system:equipment:add')") + @Log(title = "装备库管理信息-新增装备库管理", businessType = BusinessType.INSERT) + @ApiOperation(value = "添加装备库管理",response = TEquipment.class) + @PostMapping(value = "/api/t-equipment/add") + public R<Boolean> add(@RequestBody String param) { + TEquipment dto = JSON.parseObject(param,TEquipment.class); + equipmentService.save(dto); + return R.ok(); + } + + /** + * 修改装备库管理 + */ + //@PreAuthorize("@ss.hasPermi('system:equipment:edit')") + @Log(title = "装备库管理信息-修改装备库管理", businessType = BusinessType.UPDATE) + @ApiOperation(value = "修改装备库管理") + @PostMapping(value = "/api/t-equipment/update") + public R<Boolean> update(@RequestBody String param) { + TEquipment dto = JSON.parseObject(param,TEquipment.class); + equipmentService.updateById(dto); + return R.ok(); + } + + /** + * 查看装备库管理详情 + */ + //@PreAuthorize("@ss.hasPermi('system:equipment:detail')") + @ApiOperation(value = "查看装备库管理详情") + @GetMapping(value = "/open/t-equipment/getDetailById") + public R<TEquipment> getDetailById(@RequestParam String id) { + TEquipment equipment = equipmentService.getById(id); + return R.ok(equipment); + } + + /** + * 删除装备库管理 + */ + //@PreAuthorize("@ss.hasPermi('system:equipment:delete')") + @Log(title = "装备库管理信息-删除装备库管理", businessType = BusinessType.DELETE) + @ApiOperation(value = "删除装备库管理") + @DeleteMapping(value = "/open/t-equipment/deleteById") + public R<Boolean> deleteById(@RequestParam String id) { + return R.ok(equipmentService.removeById(id)); + } + + /** + * 批量删除装备库管理 + */ + //@PreAuthorize("@ss.hasPermi('system:equipment:delete')") + @Log(title = "装备库管理信息-删除装备库管理", businessType = BusinessType.DELETE) + @ApiOperation(value = "批量删除装备库管理") + @DeleteMapping(value = "/open/t-equipment/deleteByIds") + public R<Boolean> deleteByIds(@RequestBody List<String> ids) { + return R.ok(equipmentService.removeByIds(ids)); + } + } -- Gitblit v1.7.1