From fbba4ea24430b14eee18b190b7e08f1a58a8e504 Mon Sep 17 00:00:00 2001
From: XiaoRuby <3114200645@qq.com>
Date: 星期四, 03 八月 2023 13:48:38 +0800
Subject: [PATCH] LIMS管理系统框架-开发8-3
---
inspection-server/src/main/java/com/yuanchu/limslaboratory/controller/InspectionController.java | 25 +++++++++++++------------
1 files changed, 13 insertions(+), 12 deletions(-)
diff --git a/inspection-server/src/main/java/com/yuanchu/limslaboratory/controller/InspectionController.java b/inspection-server/src/main/java/com/yuanchu/limslaboratory/controller/InspectionController.java
index d5419af..f13bb17 100644
--- a/inspection-server/src/main/java/com/yuanchu/limslaboratory/controller/InspectionController.java
+++ b/inspection-server/src/main/java/com/yuanchu/limslaboratory/controller/InspectionController.java
@@ -8,6 +8,7 @@
import com.yuanchu.limslaboratory.pojo.Product;
import com.yuanchu.limslaboratory.service.*;
import com.yuanchu.limslaboratory.utils.JackSonUtil;
+import com.yuanchu.limslaboratory.utils.MyUtil;
import com.yuanchu.limslaboratory.utils.RedisUtil;
import com.yuanchu.limslaboratory.vo.Result;
import io.swagger.annotations.*;
@@ -29,7 +30,7 @@
* @author 姹熻嫃榈烽洀缃戠粶绉戞妧鏈夐檺鍏徃
* @since 2023-07-17
*/
-@Api(tags = "妫�楠屾ā鍧�")
+@Api(tags = "妫�楠屾ā鍧�-->妫�楠屽崟")
@RestController
@RequestMapping("/inspection")
public class InspectionController {
@@ -52,10 +53,7 @@
})
@PostMapping("/addInspection")
public Result addInspection(@RequestHeader("X-Token") String token, int type) throws Exception {
- System.out.println(token);
- System.out.println(type);
Object object = RedisUtil.get(token);
- System.out.println(object);
Map<String, Object> unmarshal = JackSonUtil.unmarshal(JackSonUtil.marshal(object), Map.class);
return Result.success(inspectionService.addInspection("" + unmarshal.get("name"), type));
}
@@ -71,7 +69,7 @@
return Result.success(inspectionService.selectAllInspection(pageSize, countSize, state));
}
- @ApiOperation("鏌ヨ妫�楠屽崟閲岄潰鐨勭墿鏂欎俊鎭�")
+ @ApiOperation("鏌ヨ妫�楠屽崟閲岄潰鐨勬牱鍝佷俊鎭�")
@ApiImplicitParams(value = {
@ApiImplicitParam(name = "inspectionId", value = "鎶ユ鍗旾D", dataTypeClass = String.class, required = true),
})
@@ -83,11 +81,12 @@
@ApiOperation("鏌ヨ鐗╂枡淇℃伅")
@ApiImplicitParams(value = {
@ApiImplicitParam(name = "pageSize", value = "椤垫暟", dataTypeClass = Integer.class, required = true),
- @ApiImplicitParam(name = "countSize", value = "鏉℃暟/椤�", dataTypeClass = Integer.class, required = true)
+ @ApiImplicitParam(name = "countSize", value = "鏉℃暟/椤�", dataTypeClass = Integer.class, required = true),
+ @ApiImplicitParam(name = "type", value = "绫诲瀷", dataTypeClass = Integer.class, required = true)
})
@GetMapping("/selectMaterialLimit")
- public Result selectMaterialLimit(int pageSize, int countSize) {
- return Result.success(materialService.selectMaterialLimit(pageSize, countSize));
+ public Result selectMaterialLimit(int pageSize, int countSize, int type) {
+ return Result.success(materialService.selectMaterialLimit(pageSize, countSize, type));
}
@ApiOperation("閫夋嫨鐗╂枡淇℃伅")
@@ -99,21 +98,23 @@
return Result.success(materialService.selectMaterialById(materialId));
}
- @ApiOperation("鎻愪氦鐢宠")
+ @ApiOperation("鎻愪氦妫�楠屽崟鐢宠")
@ApiImplicitParams(value = {
@ApiImplicitParam(name = "inspectionId", value = "妫�楠屽崟ID", dataTypeClass = String.class, required = true),
})
@PostMapping("/submitInspection")
public Result submitInspection(String inspectionId) {
- return Result.success(inspectionService.subInspectionByInsId(inspectionId));
+ inspectionService.subInspectionByInsId(inspectionId);
+ return Result.success();
}
- @ApiOperation("浣滃簾鐢宠")
+ @ApiOperation("浣滃簾妫�楠屽崟鐢宠")
@ApiImplicitParams(value = {
@ApiImplicitParam(name = "inspectionId", value = "妫�楠屽崟ID", dataTypeClass = String.class, required = true),
})
@PostMapping("/delInspection")
public Result delInspection(String inspectionId) {
- return Result.success(inspectionService.delInspectionByInsId(inspectionId));
+ inspectionService.delInspectionByInsId(inspectionId);
+ return Result.success();
}
}
--
Gitblit v1.9.3