From c9c4976f4e1e553edc98e4171a1d1741bde542f5 Mon Sep 17 00:00:00 2001
From: Fixiaobai <fixiaobai@163.com>
Date: 星期四, 10 八月 2023 14:03:41 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
inspection-server/src/main/java/com/yuanchu/limslaboratory/controller/InspectionController.java | 136 +++++++++++++++++++++++++++++++++++++++++++--
1 files changed, 129 insertions(+), 7 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..027e223 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,142 @@
package com.yuanchu.limslaboratory.controller;
+import com.baomidou.mybatisplus.core.metadata.IPage;
-import org.springframework.web.bind.annotation.RequestMapping;
+import java.text.ParseException;
+import java.util.*;
-import org.springframework.web.bind.annotation.RestController;
+import com.baomidou.mybatisplus.core.toolkit.ObjectUtils;
+import com.yuanchu.limslaboratory.pojo.Inspection;
+import com.yuanchu.limslaboratory.pojo.Report;
+import com.yuanchu.limslaboratory.pojo.vo.InspectionVo;
+import com.yuanchu.limslaboratory.service.LinkBasicInformationService;
+import com.yuanchu.limslaboratory.service.RawMaterialService;
+import com.yuanchu.limslaboratory.utils.JackSonUtil;
+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 com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.yuanchu.limslaboratory.service.InspectionService;
+
+import javax.annotation.Resource;
/**
- * <p>
- * 鍓嶇鎺у埗鍣�
- * </p>
+ * 鐢宠琛�(Inspection)琛ㄦ帶鍒跺眰
*
- * @author 姹熻嫃榈烽洀缃戠粶绉戞妧鏈夐檺鍏徃
- * @since 2023-07-17
+ * @author zss
+ * @since 2023-08-03 13:03:36
*/
+@Api(tags = "璇曢獙绠＄悊-->妫�楠岀敵璇�")
@RestController
@RequestMapping("/inspection")
public class InspectionController {
+ @Autowired
+ private InspectionService inspectionService;
+
+ @Resource
+ RawMaterialService rawMaterialService;
+
+ @Resource
+ LinkBasicInformationService linkBasicInformationService;
+
+ @ApiOperation(value = "鏌ヨ妫�楠岀敵璇峰崟鍒楄〃")
+ @ApiImplicitParams(value = {
+ @ApiImplicitParam(name = "pageSize", value = "椤垫暟", dataTypeClass = Integer.class, required = true),
+ @ApiImplicitParam(name = "countSize", value = "鏉℃暟/椤�", dataTypeClass = Integer.class, required = true),
+ @ApiImplicitParam(name = "message", value = "鐢宠鍗曞彿/鍘熸潗鏂欏悕绉�", dataTypeClass = String.class)
+ })
+ @GetMapping("/selectInspectsList")
+ public Result selectInspectsList(int pageSize, int countSize, String message) {
+ IPage<Map<String, Object>> inspectionPage = inspectionService.selectInspectsList(new Page<Object>(pageSize, countSize), message);
+ Map<String, Object> map = new HashMap<>();
+ map.put("total", inspectionPage.getTotal());
+ map.put("row", inspectionPage.getRecords());
+ return Result.success(map);
+ }
+
+
+ @ApiOperation(value = "鏌ヨ鎵�鏈夋姤妫�")
+ @ApiImplicitParams(value = {
+ @ApiImplicitParam(name = "type", value = "绫诲瀷", dataTypeClass = Integer.class, required = true)
+ })
+ @GetMapping("/selectAll")
+ public Result selectAll(Integer type) {
+ switch (type) {
+ case 0:
+ //鍘熸潗鏂�
+ return Result.success(rawMaterialService.selectRawmaAll());
+ case 1:
+ //濮旀墭鍗�
+ return Result.success(linkBasicInformationService.selectLinkAll());
+ case 2:
+ //鎴愬搧妫�楠�
+ return Result.success("璇疯緭鍏ユ楠屼俊鎭�!");
+ }
+ return Result.fail("绫诲瀷閿欒!");
+ }
+
+
+ @ApiOperation(value = "閫夋嫨鍘熸潗鏂欐姤妫�")
+ @ApiImplicitParams(value = {
+ @ApiImplicitParam(name = "id", value = "鍘熸潗鏂欐姤妫�鍗昳d", dataTypeClass = Integer.class, required = true),
+ @ApiImplicitParam(name = "startTime", value = "妫�楠屽紑濮嬫棩鏈�", dataTypeClass = String.class, required = true),
+ @ApiImplicitParam(name = "endTime", value = "妫�楠岀粨鏉熸棩鏈�", dataTypeClass = String.class, required = true)
+ })
+ @GetMapping("/selectRawmaById")
+ public Result selectRawmaById(Integer id, String startTime, String endTime) throws ParseException {
+ return Result.success(rawMaterialService.selectRawmaById(id, startTime, endTime));
+ }
+
+
+ @ApiOperation(value = "閫夋嫨濮旀墭鎶ユ鍜屾牱鍝�")
+ @ApiImplicitParams(value = {
+ @ApiImplicitParam(name = "bid", value = "濮旀墭鎶ユ鍗昳d", dataTypeClass = Integer.class, required = true),
+ @ApiImplicitParam(name = "did", value = "濮旀墭鎶ユ鏍峰搧id", dataTypeClass = Integer.class, required = true)
+ })
+
+
+ @GetMapping("/selectLinkByid")
+ public Result selectLinkByid(Integer bid, Integer did) {
+ return Result.success(linkBasicInformationService.selectLinkByid(bid, did));
+ }
+
+
+ @ApiOperation(value = "鏂板妫�楠屽崟")
+ @PostMapping("/addInspect")
+ public Result addInspect(@RequestHeader("token") String token, @RequestBody InspectionVo inspectionVo) throws Exception {
+ Object object = RedisUtil.get(token);
+ Map<String, Object> unmarshal = JackSonUtil.unmarshal(JackSonUtil.marshal(object), Map.class);
+ return Result.success(inspectionService.addInspect((Integer) unmarshal.get("id"), inspectionVo));
+ }
+
+ @ApiOperation(value = "鏍规嵁妫�楠屽崟id鏌ヨ鍘熸潗鏂欐楠屽崟璇︽儏")
+ @ApiImplicitParams(value = {
+ @ApiImplicitParam(name = "id", value = "妫�楠屽崟id", dataTypeClass = Integer.class, required = true)
+ })
+ @GetMapping("/selectInspectsListById")
+ public Result selectInspectsListById(Integer id) {
+ return Result.success(inspectionService.selectInspectsListById(id));
+ }
+
+ @ApiOperation(value = "涓婃姤(鏇存柊妫�楠岀姸鎬�)")
+ @ApiImplicitParams(value = {
+ @ApiImplicitParam(name = "id", value = "妫�楠屽崟id", dataTypeClass = Integer.class, required = true)
+ })
+ @PostMapping("/updateInspectsById")
+ public Result updateInspectsById(Integer id) {
+ //濡傛灉宸茬粡涓婃姤浜嗕笉鑳藉啀涓�娆′笂鎶�
+ Inspection inspection = inspectionService.getById(id);
+ if (ObjectUtils.isNotEmpty(inspection.getInspectionStatus())) {
+ return Result.fail("宸茬粡涓婃姤杩囦簡,涓嶈兘鍐嶆涓婃姤!");
+ }
+ return Result.success(inspectionService.updateInspectsById(id));
+ }
+
}
+
--
Gitblit v1.9.3