From e72b3ab95aace19535fe596897822f0e334de5d6 Mon Sep 17 00:00:00 2001
From: “zhuo” <“zhuo@itcast.cn”>
Date: 星期五, 11 八月 2023 18:00:23 +0800
Subject: [PATCH] 8-11提交代码
---
inspection-server/src/main/java/com/yuanchu/limslaboratory/controller/LinkBasicInformationController.java | 80 ++++++++++++---------------------------
1 files changed, 25 insertions(+), 55 deletions(-)
diff --git a/inspection-server/src/main/java/com/yuanchu/limslaboratory/controller/LinkBasicInformationController.java b/inspection-server/src/main/java/com/yuanchu/limslaboratory/controller/LinkBasicInformationController.java
index 2e9b26e..22de441 100644
--- a/inspection-server/src/main/java/com/yuanchu/limslaboratory/controller/LinkBasicInformationController.java
+++ b/inspection-server/src/main/java/com/yuanchu/limslaboratory/controller/LinkBasicInformationController.java
@@ -1,22 +1,20 @@
package com.yuanchu.limslaboratory.controller;
-
-import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.core.toolkit.IdWorker;
-import com.baomidou.mybatisplus.core.toolkit.ObjectUtils;
-import com.yuanchu.limslaboratory.pojo.LinkBasicInformation;
-import com.yuanchu.limslaboratory.pojo.Material;
-import com.yuanchu.limslaboratory.pojo.Standard;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.yuanchu.limslaboratory.service.LinkBasicInformationService;
-import com.yuanchu.limslaboratory.service.MaterialService;
-import com.yuanchu.limslaboratory.service.StandardService;
+import com.yuanchu.limslaboratory.utils.MyUtil;
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 java.util.HashMap;
import java.util.List;
import java.util.Map;
@@ -28,21 +26,15 @@
* @author 姹熻嫃榈烽洀缃戠粶绉戞妧鏈夐檺鍏徃
* @since 2023-08-03
*/
-@Api(tags = "鎶ユ绠＄悊-->濮旀墭妫�楠�-->閾炬帴")
+@Api(tags = "鎶ユ绠＄悊-->濮旀墭妫�楠�")
@RestController
-@RequestMapping("/link-basic")
+@RequestMapping("/link-basic-table")
public class LinkBasicInformationController {
@Autowired
private LinkBasicInformationService linkBasicInformationService;
- @Autowired
- private MaterialService materialService;
-
- @Autowired
- private StandardService standardService;
-
- @ApiOperation("鑾峰彇閾炬帴")
+ @ApiOperation("閾炬帴-->鑾峰彇閾炬帴")
@GetMapping("/link")
public Result<?> getLink() {
Object link1 = null;
@@ -56,43 +48,21 @@
return Result.success(link1);
}
- @ApiOperation("鑾峰彇鏍峰搧鍚嶇О")
- @GetMapping("/material")
- public Result<?> getMaterialIdAndName(@RequestHeader("link") String link) {
- String redisLink = RedisUtil.get("link").toString();
- if (redisLink.equals(link)){
- LambdaQueryWrapper<Material> wrapper = new LambdaQueryWrapper<>();
- wrapper.select(Material::getId, Material::getName, Material::getCode);
- List<Map<String, Object>> maps = materialService.listMaps(wrapper);
- return Result.success(maps);
- }
- return Result.fail("鎶辨瓑閾炬帴閿欒鎴栧凡杩囨湡锛�");
- }
-
- @ApiOperation("鑾峰彇瑙勬牸鍨嬪彿")
- @GetMapping("/specification")
- public Result<?> getSpecificationIdAndName(@RequestHeader("link") String link, String materialId) {
- String redisLink = RedisUtil.get("link").toString();
- if (redisLink.equals(link)){
- List<Map<String, Object>> specificationIdAndName = standardService.getSpecificationIdAndName(materialId);
- return Result.success(specificationIdAndName);
- }
- return Result.fail("鎶辨瓑閾炬帴閿欒鎴栧凡杩囨湡锛�");
- }
-
- @ApiOperation("娣诲姞妫�楠岀敵璇峰崟")
- @PostMapping("/addInspection")
- public Result<?> addLinkBasicInformation(@RequestHeader("link") String link, @RequestBody LinkBasicInformation linkBasicInformation) {
- String redisLink = RedisUtil.get("link").toString();
- if (redisLink.equals(link)){
- String code = linkBasicInformationService.addLinkBasicInformation(linkBasicInformation);
- if (!ObjectUtils.isEmpty(code)){
- return Result.success("娣诲姞鎴愬姛锛�", code);
- } else {
- return Result.fail("娣诲姞澶辫触!");
- }
- }
- return Result.fail("鎶辨瓑閾炬帴閿欒鎴栧凡杩囨湡锛�");
-
+ @ApiOperation(value = "鍒嗛〉琛ㄦ牸")
+ @ApiImplicitParams(value = {
+ @ApiImplicitParam(name = "pageNo", value = "璧峰椤�", dataTypeClass = Integer.class, required = true),
+ @ApiImplicitParam(name = "pageSize", value = "姣忎竴椤垫暟閲�", dataTypeClass = Integer.class, required = true),
+ @ApiImplicitParam(name = "entrustCoding", value = "濮旀墭缂栧彿", dataTypeClass = String.class),
+ @ApiImplicitParam(name = "sampleName", value = "鏍峰搧鍚嶇О", dataTypeClass = String.class),
+ @ApiImplicitParam(name = "entrusted", value = "濮旀墭鍗曚綅", dataTypeClass = String.class),
+ @ApiImplicitParam(name = "inspectionStatus", value = "妫�楠岀姸鎬�", dataTypeClass = Integer.class)
+ })
+ @GetMapping("/page")
+ public Result<?> getLinkBasicPage(Integer pageNo, Integer pageSize, String entrustCoding, String sampleName, String entrusted, Integer inspectionStatus) {
+ IPage<Map<String, Object>> linkBasicPage = linkBasicInformationService.getLinkBasicPage(new Page<Object>(pageNo, pageSize), entrustCoding, sampleName, entrusted, inspectionStatus);
+ Map<String, Object> map = new HashMap<>();
+ map.put("total", linkBasicPage.getTotal());
+ map.put("row", linkBasicPage.getRecords());
+ return Result.success(map);
}
}
--
Gitblit v1.9.3