From f6fcea400ef3e1ae23607c1cb4da776a70fc4240 Mon Sep 17 00:00:00 2001
From: Fixiaobai <fixiaobai@163.com>
Date: 星期三, 30 八月 2023 15:11:51 +0800
Subject: [PATCH] 合格率统计修改
---
laboratory-server/src/main/java/com/yuanchu/limslaboratory/controller/MetricalInformationController.java | 91 ++++++++++++++++++++++++++++++++++++++++++++-
1 files changed, 88 insertions(+), 3 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 6b7ceb6..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,9 +1,23 @@
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;
+import com.yuanchu.limslaboratory.vo.Result;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiImplicitParam;
+import io.swagger.annotations.ApiImplicitParams;
+import io.swagger.annotations.ApiOperation;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.*;
+import org.springframework.web.multipart.MultipartFile;
-import org.springframework.web.bind.annotation.RequestMapping;
-
-import org.springframework.web.bind.annotation.RestController;
+import java.util.List;
+import java.util.Map;
/**
* <p>
@@ -13,8 +27,79 @@
* @author 姹熻嫃榈烽洀缃戠粶绉戞妧鏈夐檺鍏徃
* @since 2023-07-20
*/
+@Api(tags = "瀹為獙瀹�-->1銆佽澶囧彴璐�-->4銆佽閲忎俊鎭�")
@RestController
@RequestMapping("/metrical-information")
public class MetricalInformationController {
+ @Autowired
+ private MetricalInformationService metricalInformationService;
+
+ @Autowired
+ private UserService userService;
+
+ @ApiOperation("娣诲姞璁￠噺淇℃伅")
+ @PostMapping("/add")
+ @AuthHandler
+ public Result<?> addMetricalInformation(MetricalInformation metricalInformation,
+ @RequestPart(value = "file", required = false) MultipartFile file) {
+ Integer isInsertSuccess = metricalInformationService.addEquipmentPointInformation(metricalInformation, file);
+ if (isInsertSuccess == 1){
+ return Result.success("娣诲姞銆�"+ metricalInformation.getMeasurementUnit() +"銆戞垚鍔燂紒");
+ }
+ return Result.fail("娣诲姞銆�"+ metricalInformation.getMeasurementUnit() +"銆戝け璐ワ紒璁惧鐮佺偣缂栫爜閲嶅锛�");
+ }
+
+ @ApiOperation("鏌ヨ鎵�鏈夎閲忎俊鎭暟鎹�")
+ @ApiImplicitParams(value = {
+ @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);
+ }
+
+ @ApiOperation("鏍规嵁璁￠噺淇℃伅Id鍒犻櫎鏁版嵁")
+ @ApiImplicitParams(value = {
+ @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){
+ return Result.success("鍒犻櫎鎴愬姛锛�");
+ }
+ return Result.fail("鍒犻櫎澶辫触锛�");
+ }
+
+ @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);
+ Integer isUpdateSuccess = metricalInformationService.updateMetricalInformation(metricalInformation, file);
+ if (isUpdateSuccess == 1){
+ return Result.success("鏇存柊鎴愬姛锛�");
+ }
+ return Result.fail("鏇存柊澶辫触锛�");
+ }
+
+ @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