From 19c9e29273e8e751847d9dcb06b346dede48d2c8 Mon Sep 17 00:00:00 2001
From: value <z1292839451@163.com>
Date: 星期三, 30 八月 2023 15:45:57 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
laboratory-server/src/main/java/com/yuanchu/limslaboratory/controller/MetricalInformationController.java | 27 +++++++++++++++++++++------
1 files changed, 21 insertions(+), 6 deletions(-)
diff --git a/laboratory-server/src/main/java/com/yuanchu/limslaboratory/controller/MetricalInformationController.java b/laboratory-server/src/main/java/com/yuanchu/limslaboratory/controller/MetricalInformationController.java
index 658b589..13aaf75 100644
--- a/laboratory-server/src/main/java/com/yuanchu/limslaboratory/controller/MetricalInformationController.java
+++ b/laboratory-server/src/main/java/com/yuanchu/limslaboratory/controller/MetricalInformationController.java
@@ -1,13 +1,12 @@
package com.yuanchu.limslaboratory.controller;
-import com.yuanchu.limslaboratory.pojo.EquipmentPoint;
+import com.yuanchu.limslaboratory.annotation.AuthHandler;
import com.yuanchu.limslaboratory.pojo.MetricalInformation;
-import com.yuanchu.limslaboratory.pojo.dto.UpdateEquipmentPointDto;
import com.yuanchu.limslaboratory.pojo.dto.UpdateMetricalInformationDto;
+import com.yuanchu.limslaboratory.pojo.dto.UpdatedMetricalInformationDto;
import com.yuanchu.limslaboratory.service.MetricalInformationService;
import com.yuanchu.limslaboratory.service.UserService;
import com.yuanchu.limslaboratory.utils.JackSonUtil;
-import com.yuanchu.limslaboratory.utils.RedisUtil;
import com.yuanchu.limslaboratory.vo.Result;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiImplicitParam;
@@ -28,7 +27,7 @@
* @author 姹熻嫃榈烽洀缃戠粶绉戞妧鏈夐檺鍏徃
* @since 2023-07-20
*/
-@Api(tags = "瀹為獙瀹�-->璁惧鍙拌处-->4銆佽閲忎俊鎭�")
+@Api(tags = "瀹為獙瀹�-->1銆佽澶囧彴璐�-->4銆佽閲忎俊鎭�")
@RestController
@RequestMapping("/metrical-information")
public class MetricalInformationController {
@@ -41,6 +40,7 @@
@ApiOperation("娣诲姞璁￠噺淇℃伅")
@PostMapping("/add")
+ @AuthHandler
public Result<?> addMetricalInformation(MetricalInformation metricalInformation,
@RequestPart(value = "file", required = false) MultipartFile file) {
Integer isInsertSuccess = metricalInformationService.addEquipmentPointInformation(metricalInformation, file);
@@ -51,9 +51,13 @@
}
@ApiOperation("鏌ヨ鎵�鏈夎閲忎俊鎭暟鎹�")
+ @ApiImplicitParams(value = {
+ @ApiImplicitParam(name = "InstrumentId", value = "浠櫒妯″潡Id", dataTypeClass = String.class, required = true)
+ })
@GetMapping("/list")
- public Result<?> getListMetricalInformation() {
- List<Map<String, Object>> list = metricalInformationService.getListEquipmentPointInformation();
+ @AuthHandler
+ public Result<?> getListMetricalInformation(String InstrumentId) {
+ List<Map<String, Object>> list = metricalInformationService.getListEquipmentPointInformation(InstrumentId);
return Result.success(list);
}
@@ -62,6 +66,7 @@
@ApiImplicitParam(name = "metricalInformationId", value = "璁￠噺淇℃伅Id", dataTypeClass = Integer.class, required = true)
})
@DeleteMapping("/delete")
+ @AuthHandler
public Result<?> deleteMetricalInformation(Integer metricalInformationId) {
Integer isDeleteSuccess = metricalInformationService.deleteMetricalInformation(metricalInformationId);
if (isDeleteSuccess == 1){
@@ -72,6 +77,7 @@
@ApiOperation("鏍规嵁璁￠噺淇℃伅Id鏇存柊鏁版嵁")
@PutMapping("/update")
+ @AuthHandler
public Result<?> updateMetricalInformation(UpdateMetricalInformationDto updateMetricalInformationDto,
@RequestPart(value = "file", required = false) MultipartFile file) throws Exception {
MetricalInformation metricalInformation = JackSonUtil.unmarshal(JackSonUtil.marshal(updateMetricalInformationDto), MetricalInformation.class);
@@ -84,7 +90,16 @@
@ApiOperation("娣诲姞璁￠噺淇℃伅鏃惰礋璐ｄ汉涓嬫媺妗嗘暟鎹�")
@GetMapping("/get_user")
+ @AuthHandler
public Result<?> getMapUserInformation() {
return Result.success(userService.getUserNameAndId());
}
+
+ @ApiOperation("鏇存柊璁￠噺缁撴灉")
+ @PostMapping("/updateMetricalInformationInfo")
+ @AuthHandler
+ public Result<?> updateMetricalInformationInfo(@RequestBody UpdatedMetricalInformationDto dto){
+ return Result.success(metricalInformationService.updateMetricalInformationInfo(dto));
+ }
+
}
--
Gitblit v1.9.3