From 2d44844cafa096bd42391b8d2c2185f0bfbf2d79 Mon Sep 17 00:00:00 2001
From: XiaoRuby <3114200645@qq.com>
Date: 星期三, 19 七月 2023 11:13:17 +0800
Subject: [PATCH] LIMS管理系统框架-开发7-19-v1.0.0
---
standard-server/src/main/java/com/yuanchu/limslaboratory/controller/SpecificationsController.java | 42 +++++++++++++++++++++++++++++++++++-------
1 files changed, 35 insertions(+), 7 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 1a9c8a1..db9cd47 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
@@ -4,22 +4,20 @@
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.pojo.Standards;
import com.yuanchu.limslaboratory.service.SpecificationsService;
import com.yuanchu.limslaboratory.utils.JackSonUtil;
-import com.yuanchu.limslaboratory.utils.MyUtil;
import com.yuanchu.limslaboratory.utils.RedisUtil;
-import com.yuanchu.limslaboratory.vo.ListSpecificationsInformation;
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.web.bind.annotation.*;
import java.util.HashMap;
-import java.util.List;
import java.util.Map;
import java.util.Objects;
@@ -31,7 +29,7 @@
* @author 姹熻嫃榈烽洀缃戠粶绉戞妧鏈夐檺鍏徃
* @since 2023-07-11
*/
-@Api(tags = "鏍囧噯搴�-->鍨嬪彿-->浜у搧瑙勬牸鎿嶄綔")
+@Api(tags = "鏍囧噯搴�-->鍨嬪彿-->浜у搧瑙勬牸")
@RestController
@RequestMapping("/specifications")
public class SpecificationsController {
@@ -57,17 +55,47 @@
@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),
+ @ApiImplicitParam(name = "serialNumberId", value = "鍨嬪彿ID", dataTypeClass = String.class,required = true)
})
@GetMapping("/list")
public Result<?> listSpecificationsInformation(Integer pageNo,
Integer pageSize,
String specificationsName,
String serialNumberId){
- IPage<ListSpecificationsInformation> pageList= specificationsService.listSpecificationsInformation(specificationsName,serialNumberId,new Page<Objects>(pageNo, pageSize));
+ 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 = String.class, required = true)
+ })
+ @DeleteMapping("/delete")
+ public Result<?> deleteSpecificationsInformation(String specificationsId) {
+ Integer isStandardsSuccess = specificationsService.deleteSpecifications(specificationsId);
+ if (isStandardsSuccess == 1) {
+ return Result.success("鍒犻櫎鎴愬姛锛�");
+ }
+ return Result.fail("鍒犻櫎澶辫触锛�");
+ }
}
--
Gitblit v1.9.3