From f330903e12d38af89d61f16c96856924d241a0f2 Mon Sep 17 00:00:00 2001 From: zss <zss@example.com> Date: 星期三, 26 七月 2023 09:08:58 +0800 Subject: [PATCH] 查删检验计划 --- laboratory-server/src/main/java/com/yuanchu/limslaboratory/controller/MetricalInformationController.java | 76 +------------------------------------ 1 files changed, 3 insertions(+), 73 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..6b7ceb6 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,24 +1,9 @@ package com.yuanchu.limslaboratory.controller; -import com.yuanchu.limslaboratory.pojo.EquipmentPoint; -import com.yuanchu.limslaboratory.pojo.MetricalInformation; -import com.yuanchu.limslaboratory.pojo.dto.UpdateEquipmentPointDto; -import com.yuanchu.limslaboratory.pojo.dto.UpdateMetricalInformationDto; -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; -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 java.util.List; -import java.util.Map; +import org.springframework.web.bind.annotation.RequestMapping; + +import org.springframework.web.bind.annotation.RestController; /** * <p> @@ -28,63 +13,8 @@ * @author 姹熻嫃榈烽洀缃戠粶绉戞妧鏈夐檺鍏徃 * @since 2023-07-20 */ -@Api(tags = "瀹為獙瀹�-->璁惧鍙拌处-->4銆佽閲忎俊鎭�") @RestController @RequestMapping("/metrical-information") public class MetricalInformationController { - @Autowired - private MetricalInformationService metricalInformationService; - - @Autowired - private UserService userService; - - @ApiOperation("娣诲姞璁¢噺淇℃伅") - @PostMapping("/add") - 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("鏌ヨ鎵�鏈夎閲忎俊鎭暟鎹�") - @GetMapping("/list") - public Result<?> getListMetricalInformation() { - List<Map<String, Object>> list = metricalInformationService.getListEquipmentPointInformation(); - return Result.success(list); - } - - @ApiOperation("鏍规嵁璁¢噺淇℃伅Id鍒犻櫎鏁版嵁") - @ApiImplicitParams(value = { - @ApiImplicitParam(name = "metricalInformationId", value = "璁¢噺淇℃伅Id", dataTypeClass = Integer.class, required = true) - }) - @DeleteMapping("/delete") - public Result<?> deleteMetricalInformation(Integer metricalInformationId) { - Integer isDeleteSuccess = metricalInformationService.deleteMetricalInformation(metricalInformationId); - if (isDeleteSuccess == 1){ - return Result.success("鍒犻櫎鎴愬姛锛�"); - } - return Result.fail("鍒犻櫎澶辫触锛�"); - } - - @ApiOperation("鏍规嵁璁¢噺淇℃伅Id鏇存柊鏁版嵁") - @PutMapping("/update") - 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("娣诲姞璁¢噺淇℃伅鏃惰礋璐d汉涓嬫媺妗嗘暟鎹�") - @GetMapping("/get_user") - public Result<?> getMapUserInformation() { - return Result.success(userService.getUserNameAndId()); - } } -- Gitblit v1.9.3