From ce10da906c58596fce43bffa6a6d177268ca177b Mon Sep 17 00:00:00 2001
From: value <z1292839451@163.com>
Date: 星期二, 30 四月 2024 00:54:42 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
cnas-server/src/main/java/com/yuanchu/mom/controller/LaboratoryController.java | 40 +++++++++++++++++++++++++---------------
1 files changed, 25 insertions(+), 15 deletions(-)
diff --git a/cnas-server/src/main/java/com/yuanchu/mom/controller/LaboratoryController.java b/cnas-server/src/main/java/com/yuanchu/mom/controller/LaboratoryController.java
index 21982ae..c008538 100644
--- a/cnas-server/src/main/java/com/yuanchu/mom/controller/LaboratoryController.java
+++ b/cnas-server/src/main/java/com/yuanchu/mom/controller/LaboratoryController.java
@@ -1,32 +1,37 @@
package com.yuanchu.mom.controller;
+import cn.hutool.core.lang.UUID;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.yuanchu.mom.annotation.ValueAuth;
+import com.yuanchu.mom.annotation.ValueClassify;
import com.yuanchu.mom.pojo.Laboratory;
import com.yuanchu.mom.service.LaboratoryService;
import com.yuanchu.mom.utils.JackSonUtil;
import com.yuanchu.mom.vo.Result;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
-import lombok.AllArgsConstructor;
-import org.springframework.web.bind.annotation.PostMapping;
-import org.springframework.web.bind.annotation.RequestBody;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RestController;
+import org.springframework.beans.factory.annotation.Value;
+import org.springframework.web.bind.annotation.*;
+import javax.annotation.Resource;
+import javax.annotation.Resources;
import java.util.Map;
/**
* 瀹為獙瀹ょ鐞�(LaboratoryController)琛ㄦ帶鍒跺眰
*/
@Api(tags = "鍦烘墍鎴栬鏂�")
-@AllArgsConstructor
+
@RestController
@RequestMapping("/laboratoryScope")
public class LaboratoryController {
+ @Value("${file.path}")
+ private String filePath;
+ @Resource
private LaboratoryService laboratoryService;
-
+ @ValueClassify("鍦烘墍鎴栬鏂�")
@ApiOperation(value = "鏌ヨ瀹為獙瀹ょ鐞嗗垪琛�")
@PostMapping("/selectItemParameter")
public Result selectItemParameter(@RequestBody Map<String, Object> data) throws Exception {
@@ -34,19 +39,19 @@
Laboratory itemParameter = JackSonUtil.unmarshal(JackSonUtil.marshal(data.get("entity")), Laboratory.class);
return Result.success(laboratoryService.selectItemParameter(page, itemParameter));
}
-
+ @ValueClassify("鍦烘墍鎴栬鏂�")
@ApiOperation(value = "娣诲姞瀹為獙瀹ゅ弬鏁�")
@PostMapping("/addParameter")
public Result addParameter(@RequestBody Laboratory itemParameter) {
return Result.success(laboratoryService.addParameter(itemParameter));
}
-
+ @ValueClassify("鍦烘墍鎴栬鏂�")
@ApiOperation(value = "鍒犻櫎瀹為獙瀹ゅ弬鏁�")
@PostMapping("/delParameter")
public Result<?> delParameter(Integer id) {
return Result.success(laboratoryService.delParameter(id));
}
-
+ @ValueClassify("鍦烘墍鎴栬鏂�")
@ApiOperation(value = "淇敼瀹為獙瀹ゅ弬鏁�")
@PostMapping("/upParameter")
public Result<?> upParameter(@RequestBody Laboratory itemParameter) {
@@ -54,11 +59,16 @@
}
@ApiOperation(value = "鑾峰彇瀹為獙瀹ゅ悕绉�")
- @PostMapping("/obtainItemParameterList")
- public Result obtainItemParameterList(@RequestBody Map<String, Object> data) throws Exception {
- Page page = JackSonUtil.unmarshal(JackSonUtil.marshal(data.get("page")), Page.class);
- Laboratory itemParameter = JackSonUtil.unmarshal(JackSonUtil.marshal(data.get("entity")), Laboratory.class);
- return Result.success(laboratoryService.obtainItemParameterList(page, itemParameter));
+ @GetMapping("/obtainItemParameterList")
+ @ValueAuth
+ public Result obtainItemParameterList() {
+ return Result.success(laboratoryService.obtainItemParameterList());
}
}
+
+
+
+
+
+
--
Gitblit v1.9.3