From 5322edbcc5529864aaea26d78289df7a8a36fb77 Mon Sep 17 00:00:00 2001
From: 李林 <z1292839451@163.com>
Date: 星期四, 20 七月 2023 11:25:18 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
standard-server/src/main/java/com/yuanchu/limslaboratory/controller/StandardsController.java | 52 ++++++++++++++++++++++++++++++++++++++++++++++------
1 files changed, 46 insertions(+), 6 deletions(-)
diff --git a/standard-server/src/main/java/com/yuanchu/limslaboratory/controller/StandardsController.java b/standard-server/src/main/java/com/yuanchu/limslaboratory/controller/StandardsController.java
index c7fdf0d..e101634 100644
--- a/standard-server/src/main/java/com/yuanchu/limslaboratory/controller/StandardsController.java
+++ b/standard-server/src/main/java/com/yuanchu/limslaboratory/controller/StandardsController.java
@@ -2,6 +2,8 @@
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.yuanchu.limslaboratory.pojo.Standards;
import com.yuanchu.limslaboratory.service.StandardsService;
import com.yuanchu.limslaboratory.utils.JackSonUtil;
@@ -13,10 +15,13 @@
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;
/**
* <p>
@@ -26,7 +31,7 @@
* @author 姹熻嫃榈烽洀缃戠粶绉戞妧鏈夐檺鍏徃
* @since 2023-07-11
*/
-@Api(tags = "鏍囧噯搴撴搷浣�")
+@Api(tags = "鏍囧噯搴�-->猸愨瓙猸�")
@RestController
@RequestMapping("/standards")
public class StandardsController {
@@ -47,13 +52,48 @@
return Result.fail("娣诲姞銆�"+ standards.getName() +"銆戝け璐ワ紒");
}
- @ApiOperation("鏍囧噯搴�-->鐐瑰嚮鍏ㄩ儴锛氭煡璇㈡墍鏈夋爣鍑嗘暟鎹�")
+ @ApiOperation("鏍囧噯搴�-->渚ц竟鏍忔煡璇㈡墍鏈夋爣鍑嗘暟鎹�")
+ @GetMapping("/list")
+ public Result<?> listStandardsInformation(){
+ List<Map<String, Object>> list = standardsService.listStandardsInformation();
+ return Result.success(list);
+ }
+
+ @ApiOperation("鏍囧噯搴�-->鐐瑰嚮鍏ㄩ儴锛氬垎椤垫煡璇㈡墍鏈夋爣鍑嗘暟鎹�")
@ApiImplicitParams(value = {
+ @ApiImplicitParam(name = "pageNo", value = "璧峰椤�", dataTypeClass = Integer.class, required = true),
+ @ApiImplicitParam(name = "pageSize", value = "姣忎竴椤垫暟閲�", dataTypeClass = Integer.class, required = true),
@ApiImplicitParam(value = "鏍囧噯鍙�/鏍囧噯鍚嶇О", name = "IdOrNameOfStandards", dataTypeClass = String.class)
})
- @GetMapping("/list")
- public Result<?> listStandardsInformation(String IdOrNameOfStandards){
- List<Map<String, Object>> list = standardsService.listStandardsInformation(IdOrNameOfStandards);
- return Result.success(list);
+ @GetMapping("/list_page")
+ public Result<?> listPageStandardsInformation(Integer pageNo, Integer pageSize, String IdOrNameOfStandards){
+ IPage<Map<String, Object>> listPage = standardsService.listPageStandardsInformation(new Page<Object>(pageNo, pageSize), IdOrNameOfStandards);
+ Map<String, Object> map = new HashMap<>();
+ map.put("row", listPage.getRecords());
+ map.put("total", listPage.getTotal());
+ return Result.success(map);
+ }
+
+ @ApiOperation("鏍囧噯搴�-->鏍规嵁Id淇敼鍙傛暟")
+ @PutMapping("/update")
+ public Result<?> updateStandardsInformation(@RequestHeader("X-Token") String token, @RequestBody Standards standards) throws Exception {
+ Object object = RedisUtil.get(token);
+ Map<String, Object> unmarshal = JackSonUtil.unmarshal(JackSonUtil.marshal(object), Map.class);
+ standards.setUserId((Integer) unmarshal.get("id"));
+ Integer isUpdateSuccess = standardsService.updateStandardsInformation(standards);
+ if (isUpdateSuccess == 1){
+ return Result.success("鏇存柊鎴愬姛锛�");
+ }
+ return Result.fail("鏇存柊澶辫触锛�");
+ }
+
+ @ApiOperation("鏍囧噯搴�-->鏍规嵁ID鍒犻櫎鏁版嵁")
+ @DeleteMapping("/delete")
+ public Result<?> deleteStandardsInformation(String standardsId) {
+ Integer isDeleteSuccess = standardsService.deleteStandardsInformation(standardsId);
+ if (isDeleteSuccess == 1){
+ return Result.success("鍒犻櫎鎴愬姛锛�");
+ }
+ return Result.fail("鍒犻櫎澶辫触锛�");
}
}
--
Gitblit v1.9.3