From 56dfe0d4bf81262622a1919cceb2b039fd356209 Mon Sep 17 00:00:00 2001
From: 无关风月 <443237572@qq.com>
Date: 星期二, 03 九月 2024 16:52:49 +0800
Subject: [PATCH] 代码提交 bug解决
---
ruoyi-modules/ruoyi-management/src/main/java/com/ruoyi/management/controller/SlEquipmentController.java | 27 +++++++++++++++++++++++----
1 files changed, 23 insertions(+), 4 deletions(-)
diff --git a/ruoyi-modules/ruoyi-management/src/main/java/com/ruoyi/management/controller/SlEquipmentController.java b/ruoyi-modules/ruoyi-management/src/main/java/com/ruoyi/management/controller/SlEquipmentController.java
index 76d2d7c..db18819 100644
--- a/ruoyi-modules/ruoyi-management/src/main/java/com/ruoyi/management/controller/SlEquipmentController.java
+++ b/ruoyi-modules/ruoyi-management/src/main/java/com/ruoyi/management/controller/SlEquipmentController.java
@@ -3,6 +3,9 @@
import com.ruoyi.common.core.domain.R;
import com.ruoyi.common.core.utils.page.PageDTO;
+import com.ruoyi.common.core.web.domain.AjaxResult;
+import com.ruoyi.common.security.service.TokenService;
+import com.ruoyi.management.domain.SlEquipment;
import com.ruoyi.management.domain.dto.InventoriesSuppDTO;
import com.ruoyi.management.domain.dto.InventoriesSuppliesQuery;
import com.ruoyi.management.domain.dto.SlEquipmentDTO;
@@ -11,6 +14,7 @@
import com.ruoyi.management.domain.vo.SlEquipmentVO;
import com.ruoyi.management.service.InventoriesSuppliesService;
import com.ruoyi.management.service.SlEquipmentService;
+import com.ruoyi.system.api.domain.SeBei;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
import io.swagger.annotations.ApiParam;
@@ -33,32 +37,47 @@
@Resource
private SlEquipmentService slEquipmentService;
+ @Resource
+ private TokenService tokenService;
@PostMapping("/getSlEquipmentList")
@ApiOperation(value = "分页获设备管理")
public R<PageDTO<SlEquipmentVO>> getSlEquipmentList(@RequestBody SlEquipmentQuery slEquipmentQuery) {
+ tokenService.getLoginUser();
return R.ok(slEquipmentService.getSlEquipmentList(slEquipmentQuery));
}
@PostMapping("/addSlEquipment")
@ApiOperation(value = "添加设备管理")
- public R addSlEquipment(@RequestBody SlEquipmentDTO slEquipmentDTO) {
- slEquipmentService.addSlEquipment(slEquipmentDTO);
- return R.ok();
+ public AjaxResult addSlEquipment(@RequestBody SlEquipmentDTO slEquipmentDTO) {
+ tokenService.getLoginUser();
+ return slEquipmentService.addSlEquipment(slEquipmentDTO);
}
@ApiOperation("删除设备管理")
@DeleteMapping("/{id}")
public R<?> delSlEquipment(
@ApiParam(name = "id", value = "设备管理id", required = true) @PathVariable("id") Long id) {
- slEquipmentService.removeById(id);
+ tokenService.getLoginUser();
+ SlEquipment byId = slEquipmentService.getById(id);
+ byId.setDelFlag("1");
+ slEquipmentService.updateById(byId);
return R.ok();
}
@PostMapping("/getSlEquipmentOne")
@ApiOperation(value = "设备管理详情")
public R<SlEquipmentVO> getSlEquipmentOne(@RequestBody SlEquipmentDTO slEquipmentDTO) {
+ tokenService.getLoginUser();
return R.ok(slEquipmentService.getSlEquipmentOne(slEquipmentDTO));
}
+ @PostMapping("/getequipmente")
+ public R<Integer> getequipmente(@RequestBody SeBei seBei){
+ tokenService.getLoginUser();
+ return R.ok(slEquipmentService.getequipmente(seBei));
+
+ }
+
+
}
--
Gitblit v1.7.1