From 53b5ea2b96d76b2072819f14a48f26c58cea0f84 Mon Sep 17 00:00:00 2001
From: value <z1292839451@163.com>
Date: 星期二, 29 八月 2023 08:59:46 +0800
Subject: [PATCH] 修改bug
---
standard-server/src/main/java/com/yuanchu/limslaboratory/controller/SpecificationsController.java | 74 +++++++-----------------------------
1 files changed, 15 insertions(+), 59 deletions(-)
diff --git a/standard-server/src/main/java/com/yuanchu/limslaboratory/controller/SpecificationsController.java b/standard-server/src/main/java/com/yuanchu/limslaboratory/controller/SpecificationsController.java
index 0edbaab..7672044 100644
--- a/standard-server/src/main/java/com/yuanchu/limslaboratory/controller/SpecificationsController.java
+++ b/standard-server/src/main/java/com/yuanchu/limslaboratory/controller/SpecificationsController.java
@@ -1,25 +1,18 @@
package com.yuanchu.limslaboratory.controller;
-import com.baomidou.mybatisplus.core.metadata.IPage;
-import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
-import com.yuanchu.limslaboratory.pojo.Specifications;
+import com.yuanchu.limslaboratory.annotation.AuthHandler;
+import com.yuanchu.limslaboratory.pojo.dto.AddSpecifications;
+import com.yuanchu.limslaboratory.pojo.dto.AddStandardDto;
import com.yuanchu.limslaboratory.service.SpecificationsService;
-import com.yuanchu.limslaboratory.utils.JackSonUtil;
-import com.yuanchu.limslaboratory.utils.RedisUtil;
import com.yuanchu.limslaboratory.vo.Result;
-import com.yuanchu.limslaboratory.vo.UpdateSpecificationsInformation;
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.util.ObjectUtils;
+import org.springframework.validation.annotation.Validated;
import org.springframework.web.bind.annotation.*;
-
-import java.util.HashMap;
-import java.util.Map;
-import java.util.Objects;
/**
* <p>
@@ -29,7 +22,7 @@
* @author 姹熻嫃榈烽洀缃戠粶绉戞妧鏈夐檺鍏徃
* @since 2023-07-11
*/
-@Api(tags = "鏍囧噯搴�-->鍨嬪彿-->浜у搧瑙勬牸")
+@Api(tags = "鏍囧噯搴�-->3銆佷骇鍝佸瀷鍙�")
@RestController
@RequestMapping("/specifications")
public class SpecificationsController {
@@ -37,60 +30,23 @@
@Autowired
private SpecificationsService specificationsService;
- @ApiOperation("鏍囧噯搴�-->浜у搧瑙勬牸")
+ @ApiOperation("娣诲姞鐗╂枡")
@PostMapping("/add")
- public Result<?> addSpecificationsInformation(@RequestHeader("X-Token") String token,@RequestBody Specifications specifications) throws Exception {
- Object object = RedisUtil.get(token);
- Map<String, Object> unmarshal = JackSonUtil.unmarshal(JackSonUtil.marshal(object), Map.class);
- specifications.setUserId((Integer) unmarshal.get("id"));
- Integer isStandardsSuccess = specificationsService.addSpecificationsInformation(specifications);
- if (isStandardsSuccess == 1) {
- return Result.success("娣诲姞銆�"+ specifications.getName() +"銆戞垚鍔燂紒");
+ @AuthHandler
+ public Result<?> addSpecificationsInformation(@Validated @RequestBody AddSpecifications addSpecifications) {
+ Integer isMaterialSuccess = specificationsService.addSpecificationsInformation(addSpecifications);
+ if (isMaterialSuccess == 1) {
+ return Result.success("娣诲姞鐗╂枡銆�"+ addSpecifications.getSpecificationsName() +"銆戞垚鍔燂紒");
}
- return Result.fail("娣诲姞銆�"+ specifications.getName() +"銆戝け璐ワ紒");
+ return Result.fail("娣诲姞鐗╂枡銆�"+ addSpecifications.getSpecificationsName() +"銆戝け璐ワ紒");
}
- @ApiOperation("鏍囧噯搴�-->鏍规嵁鍨嬪彿鏌ヨ浜у搧瑙勬牸")
+ @ApiOperation("鍒犻櫎浜у搧鍨嬪彿")
@ApiImplicitParams(value = {
- @ApiImplicitParam(name = "pageNo", value = "璧峰椤�", dataTypeClass = Integer.class, required = true),
- @ApiImplicitParam(name = "pageSize", value = "姣忎竴椤垫暟閲�", dataTypeClass = Integer.class, required = true),
- @ApiImplicitParam(name = "specificationsName", value = "瑙勬牸鍚嶇О", dataTypeClass = String.class),
- @ApiImplicitParam(name = "serialNumberId", value = "鍨嬪彿ID", dataTypeClass = String.class,required = true)
- })
- @GetMapping("/list")
- public Result<?> listSpecificationsInformation(Integer pageNo,
- Integer pageSize,
- String specificationsName,
- String serialNumberId){
- IPage<Map<String, Objects>> pageList= specificationsService.listSpecificationsInformation(specificationsName,serialNumberId,new Page<Objects>(pageNo, pageSize));
- Map<String, Object> map = new HashMap<>();
- map.put("row", pageList.getRecords());
- map.put("total", pageList.getTotal());
- return Result.success(map);
- }
-
- @ApiOperation("鏍囧噯搴�-->浜у搧瑙勬牸-->缂栬緫")
- @PutMapping("/update")
- public Result<?> updateSpecificationsInformation(@RequestHeader("X-Token") String token, @RequestBody UpdateSpecificationsInformation updateSpecificationsInformation) throws Exception {
- Object object = RedisUtil.get(token);
- if (ObjectUtils.isEmpty(object)){
- return Result.fail("瀵逛笉璧凤紝璇锋惡甯oken!");
- }
- Map<String, Object> unmarshal = JackSonUtil.unmarshal(JackSonUtil.marshal(object), Map.class);
- updateSpecificationsInformation.setUserId((Integer) unmarshal.get("id"));
- Specifications specifications = JackSonUtil.unmarshal(JackSonUtil.marshal(updateSpecificationsInformation), Specifications.class);
- Integer isStandardsSuccess = specificationsService.updateSpecificationsInformation(specifications);
- if (isStandardsSuccess == 1) {
- return Result.success("鏇存柊銆�"+ specifications.getName() +"銆戞垚鍔燂紒");
- }
- return Result.fail("鏇存柊銆�"+ specifications.getName() +"銆戝け璐ワ紒");
- }
-
- @ApiOperation("鏍囧噯搴�-->浜у搧瑙勬牸-->鍒犻櫎")
- @ApiImplicitParams(value = {
- @ApiImplicitParam(name = "specificationsId", value = "瑙勬牸Id", dataTypeClass = Integer.class, required = true)
+ @ApiImplicitParam(name = "specificationsId", value = "鍨嬪彿Id", dataTypeClass = Integer.class, required = true)
})
@DeleteMapping("/delete")
+ @AuthHandler
public Result<?> deleteSpecificationsInformation(Integer specificationsId) {
Integer isStandardsSuccess = specificationsService.deleteSpecifications(specificationsId);
if (isStandardsSuccess == 1) {
--
Gitblit v1.9.3