From c5138faa1c4771bfbc19de5b257e7c129c081cb8 Mon Sep 17 00:00:00 2001
From: Fixiaobai <fixiaobai@163.com>
Date: 星期一, 28 八月 2023 13:30:17 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
laboratory-server/src/main/java/com/yuanchu/limslaboratory/controller/MetricalInformationController.java | 13 +++++++++++--
1 files changed, 11 insertions(+), 2 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 fa11132..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,7 +1,9 @@
package com.yuanchu.limslaboratory.controller;
+import com.yuanchu.limslaboratory.annotation.AuthHandler;
import com.yuanchu.limslaboratory.pojo.MetricalInformation;
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;
@@ -38,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);
@@ -52,6 +55,7 @@
@ApiImplicitParam(name = "InstrumentId", value = "浠櫒妯″潡Id", dataTypeClass = String.class, required = true)
})
@GetMapping("/list")
+ @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,13 +90,16 @@
@ApiOperation("娣诲姞璁￠噺淇℃伅鏃惰礋璐ｄ汉涓嬫媺妗嗘暟鎹�")
@GetMapping("/get_user")
+ @AuthHandler
public Result<?> getMapUserInformation() {
return Result.success(userService.getUserNameAndId());
}
@ApiOperation("鏇存柊璁￠噺缁撴灉")
- public Result<?> updateMetricalInformationResult(String code,Integer result){
- return null;
+ @PostMapping("/updateMetricalInformationInfo")
+ @AuthHandler
+ public Result<?> updateMetricalInformationInfo(@RequestBody UpdatedMetricalInformationDto dto){
+ return Result.success(metricalInformationService.updateMetricalInformationInfo(dto));
}
}
--
Gitblit v1.9.3