From 562926922386bb24070ea27eb5a27193c41e996b Mon Sep 17 00:00:00 2001
From: zss <zss@example.com>
Date: 星期四, 18 四月 2024 14:46:50 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
cnas-server/src/main/java/com/yuanchu/mom/controller/CapacityScopeController.java | 18 +++++++++++++-----
1 files changed, 13 insertions(+), 5 deletions(-)
diff --git a/cnas-server/src/main/java/com/yuanchu/mom/controller/CapacityScopeController.java b/cnas-server/src/main/java/com/yuanchu/mom/controller/CapacityScopeController.java
index 84dcc00..449c60a 100644
--- a/cnas-server/src/main/java/com/yuanchu/mom/controller/CapacityScopeController.java
+++ b/cnas-server/src/main/java/com/yuanchu/mom/controller/CapacityScopeController.java
@@ -1,6 +1,7 @@
package com.yuanchu.mom.controller;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.yuanchu.mom.annotation.ValueAuth;
import com.yuanchu.mom.dto.PageTestObjectDto;
import com.yuanchu.mom.pojo.StructureItemParameter;
import com.yuanchu.mom.pojo.StructureTestObject;
@@ -38,7 +39,7 @@
@ApiOperation(value = "娣诲姞椤圭洰妫�楠屽弬鏁�")
@PostMapping("/addItemParameter")
- public Result addItemParameterList(@RequestBody StructureItemParameter itemParameter) {
+ public Result addItemParameter(@RequestBody StructureItemParameter itemParameter) {
return Result.success(capacityScopeService.addItemParameter(itemParameter));
}
@@ -54,7 +55,7 @@
return Result.success(capacityScopeService.upItemParameter(itemParameter));
}
- @ApiOperation(value = "鑾峰彇椤圭洰妫�楠屽弬鏁板垪琛�")
+ @ApiOperation(value = "鑾峰彇妫�楠屽璞�")
@PostMapping("/selectTestObjectList")
public Result selectTestObjectList(@RequestBody Map<String, Object> data) throws Exception {
Page page = JackSonUtil.unmarshal(JackSonUtil.marshal(data.get("page")), Page.class);
@@ -62,22 +63,29 @@
return Result.success(capacityScopeService.selectTestObjectList(page, pageTestObjectDto));
}
- @ApiOperation(value = "娣诲姞椤圭洰妫�楠屽弬鏁�")
+ @ApiOperation(value = "娣诲姞妫�楠屽璞�")
@PostMapping("/addTestObject")
public Result addTestObject(@RequestBody StructureTestObject testObject) {
return Result.success(capacityScopeService.addTestObject(testObject));
}
- @ApiOperation(value = "鍒犻櫎椤圭洰妫�楠屽弬鏁�")
+ @ApiOperation(value = "鍒犻櫎妫�楠屽璞�")
@PostMapping("/delTestObject")
public Result<?> delTestObject(Integer id) {
return Result.success(capacityScopeService.delTestObject(id));
}
- @ApiOperation(value = "淇敼椤圭洰妫�楠屽弬鏁�")
+ @ApiOperation(value = "淇敼妫�楠屽璞�")
@PostMapping("/upTestObject")
public Result upTestObject(@RequestBody StructureTestObject testObject) {
return Result.success(capacityScopeService.upTestObject(testObject));
}
+
+ @ApiOperation(value = "鑾峰彇妫�楠屽璞℃灇涓�")
+ @GetMapping("/selectTestObjectByName")
+ @ValueAuth
+ public Result selectTestObjectByName() {
+ return Result.success(capacityScopeService.selectTestObjectByName());
+ }
}
--
Gitblit v1.9.3