From 30f6da8bf0143906b42fa600f6a604cea6c81f71 Mon Sep 17 00:00:00 2001
From: XiaoRuby <3114200645@qq.com>
Date: 星期三, 26 七月 2023 09:16:15 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
inspection-server/src/main/java/com/yuanchu/limslaboratory/controller/InspectionController.java | 102 +++++++++++++++++++++++++++++++++++++++++++++++++-
1 files changed, 99 insertions(+), 3 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 3e22a62..c0295d4 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
@@ -1,20 +1,116 @@
package com.yuanchu.limslaboratory.controller;
-import org.springframework.web.bind.annotation.RequestMapping;
+import com.baomidou.mybatisplus.core.toolkit.IdWorker;
+import com.yuanchu.limslaboratory.pojo.Inspection;
+import com.yuanchu.limslaboratory.pojo.InspectionMaterialList;
+import com.yuanchu.limslaboratory.pojo.InspectionProductList;
+import com.yuanchu.limslaboratory.pojo.Product;
+import com.yuanchu.limslaboratory.service.*;
+import com.yuanchu.limslaboratory.utils.JackSonUtil;
+import com.yuanchu.limslaboratory.utils.RedisUtil;
+import com.yuanchu.limslaboratory.vo.Result;
+import io.swagger.annotations.*;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.transaction.annotation.Transactional;
+import org.springframework.web.bind.annotation.*;
-import org.springframework.web.bind.annotation.RestController;
+import javax.annotation.Resource;
+import java.util.ArrayList;
+import java.util.Date;
+import java.util.List;
+import java.util.Map;
/**
* <p>
- * 鍓嶇鎺у埗鍣�
+ * 鍓嶇鎺у埗鍣�
* </p>
*
* @author 姹熻嫃榈烽洀缃戠粶绉戞妧鏈夐檺鍏徃
* @since 2023-07-17
*/
+@Api(tags = "妫�楠屾ā鍧�-->妫�楠屽崟")
@RestController
@RequestMapping("/inspection")
public class InspectionController {
+ @Autowired
+ private InspectionService inspectionService;
+
+ @Autowired
+ private InspectionMaterialListService inspectionMaterialListService;
+
+ @Autowired
+ private InspectionProductListService inspectionProductListService;
+
+ @Autowired
+ private MaterialService materialService;
+
+ @ApiOperation("娣诲姞妫�楠岀敵璇峰崟")
+ @ApiImplicitParams(value = {
+ @ApiImplicitParam(name = "type", value = "妫�楠岀被鍨�", dataTypeClass = Integer.class, required = true),
+ })
+ @PostMapping("/addInspection")
+ public Result addInspection(@RequestHeader("X-Token") String token, int type) throws Exception {
+ Object object = RedisUtil.get(token);
+ Map<String, Object> unmarshal = JackSonUtil.unmarshal(JackSonUtil.marshal(object), Map.class);
+ return Result.success(inspectionService.addInspection("" + unmarshal.get("name"), type));
+ }
+
+ @ApiOperation("鏌ヨ鎵�鏈夋楠屽崟鍒楄〃")
+ @ApiImplicitParams(value = {
+ @ApiImplicitParam(name = "pageSize", value = "椤垫暟", dataTypeClass = Integer.class, required = true),
+ @ApiImplicitParam(name = "countSize", value = "鏉℃暟/椤�", dataTypeClass = Integer.class, required = true),
+ @ApiImplicitParam(name = "state", value = "鐘舵��(涓虹┖=鍏ㄩ儴)", dataTypeClass = Integer.class)
+ })
+ @GetMapping("/selectAllInspection")
+ public Result selectAllInspection(int pageSize, int countSize, Integer state) {
+ return Result.success(inspectionService.selectAllInspection(pageSize, countSize, state));
+ }
+
+ @ApiOperation("鏌ヨ妫�楠屽崟閲岄潰鐨勭墿鏂欎俊鎭�")
+ @ApiImplicitParams(value = {
+ @ApiImplicitParam(name = "inspectionId", value = "鎶ユ鍗旾D", dataTypeClass = String.class, required = true),
+ })
+ @PostMapping("/selectMaterialByInsId")
+ public Result selectMaterialByInsId(String inspectionId) {
+ return Result.success(inspectionMaterialListService.selectInspectionMaterialListByInsId(inspectionId));
+ }
+
+ @ApiOperation("鏌ヨ鐗╂枡淇℃伅")
+ @ApiImplicitParams(value = {
+ @ApiImplicitParam(name = "pageSize", value = "椤垫暟", dataTypeClass = Integer.class, required = true),
+ @ApiImplicitParam(name = "countSize", value = "鏉℃暟/椤�", dataTypeClass = Integer.class, required = true)
+ })
+ @GetMapping("/selectMaterialLimit")
+ public Result selectMaterialLimit(int pageSize, int countSize) {
+ return Result.success(materialService.selectMaterialLimit(pageSize, countSize));
+ }
+
+ @ApiOperation("閫夋嫨鐗╂枡淇℃伅")
+ @ApiImplicitParams(value = {
+ @ApiImplicitParam(name = "materialId", value = "鐗╂枡ID", dataTypeClass = Integer.class, required = true),
+ })
+ @PostMapping("/selectMaterialById")
+ public Result selectMaterialById(String materialId) {
+ return Result.success(materialService.selectMaterialById(materialId));
+ }
+
+ @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));
+ }
+
+ @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));
+ }
}
--
Gitblit v1.9.3