From e29f147aab5b0b0b794d611b522b67b94423e3cf Mon Sep 17 00:00:00 2001
From: Fixiaobai <fixiaobai@163.com>
Date: 星期四, 07 九月 2023 17:56:57 +0800
Subject: [PATCH] 修改bug

---
 inspection-server/src/main/java/com/yuanchu/limslaboratory/controller/PlanController.java |   71 +++++++++++++++++++++++++++++------
 1 files changed, 58 insertions(+), 13 deletions(-)

diff --git a/inspection-server/src/main/java/com/yuanchu/limslaboratory/controller/PlanController.java b/inspection-server/src/main/java/com/yuanchu/limslaboratory/controller/PlanController.java
index 6768f4c..5dca2be 100644
--- a/inspection-server/src/main/java/com/yuanchu/limslaboratory/controller/PlanController.java
+++ b/inspection-server/src/main/java/com/yuanchu/limslaboratory/controller/PlanController.java
@@ -1,21 +1,18 @@
 package com.yuanchu.limslaboratory.controller;
 
-import com.baomidou.mybatisplus.core.metadata.IPage;
-import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
-import com.yuanchu.limslaboratory.pojo.vo.PlanVo;
+import com.yuanchu.limslaboratory.annotation.AuthHandler;
 import com.yuanchu.limslaboratory.service.PlanService;
 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.format.annotation.DateTimeFormat;
 import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.PostMapping;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RestController;
 
 import javax.annotation.Resource;
-import java.util.*;
 
 /**
  * <p>
@@ -34,16 +31,64 @@
     private PlanService planService;
 
 
-    @ApiOperation("鏌ヨ妫�楠岃鍒�")
+    @ApiOperation("鏌ヨ鎵�鏈夋楠岃鍒�")
     @ApiImplicitParams(value = {
-            @ApiImplicitParam(name = "deviceId", value = "璁惧鍚嶇ОId", dataTypeClass = Integer.class),
-            @ApiImplicitParam(name = "beginTime", value = "妫�楠屽紑濮嬫椂闂�", dataTypeClass = Date.class),
-            @ApiImplicitParam(name = "endTime", value = "妫�楠岀粨鏉熸椂闂�", dataTypeClass = Date.class),
-            @ApiImplicitParam(name = "userId", value = "妫�楠屼汉", dataTypeClass = Integer.class)
+            @ApiImplicitParam(name = "code", value = "鐢宠鍗曠紪鍙�", dataTypeClass = String.class),
+            @ApiImplicitParam(name = "beginTime", value = "妫�楠屽紑濮嬫椂闂�", dataTypeClass = String.class),
+            @ApiImplicitParam(name = "endTime", value = "妫�楠岀粨鏉熸椂闂�", dataTypeClass = String.class),
+            @ApiImplicitParam(name = "status", value = "妫�楠岀粨鏋�", dataTypeClass = Integer.class),
+            @ApiImplicitParam(name = "isLookMe", value = "鏄惁鍙湅鎴�", dataTypeClass = Boolean.class)
     })
     @GetMapping("/selectAllPlan")
-    public Result selectAllPlan(Integer deviceId, @DateTimeFormat(pattern = "yyyy-MM-dd") Date beginTime, @DateTimeFormat(pattern = "yyyy-MM-dd") Date endTime, Integer userId) {
-        List<PlanVo> planVoList = planService.selectAllPlan(deviceId, beginTime, endTime, userId);
-        return Result.success(planVoList);
+    @AuthHandler
+    public Result selectAllPlan(String code, String beginTime, String endTime, Integer status,boolean isLookMe) {
+        return Result.success(planService.selectAllPlan(code, beginTime, endTime, status,isLookMe));
+    }
+
+    @ApiOperation("鍒嗛厤-->閫夋嫨妫�楠屼汉")
+    @GetMapping("/choosecheck")
+    @AuthHandler
+    public Result choosecheck() {
+        return Result.success(planService.choosecheck());
+    }
+
+    @ApiOperation("鍒嗛厤--閫夋嫨璁惧")
+    @GetMapping("/chooseinstum")
+    @AuthHandler
+    public Result chooseinstum() {
+        return Result.success(planService.chooseinstum());
+    }
+
+    @ApiOperation("鍒嗛厤")
+    @ApiImplicitParams(value = {
+            @ApiImplicitParam(name = "id", value = "妫�楠岄」鐩甶d", dataTypeClass = Integer.class, required = true),
+            @ApiImplicitParam(name = "userId", value = "鎵ц浜篿d", dataTypeClass = Integer.class, required = true),
+            @ApiImplicitParam(name = "instrumentId", value = "璁惧id", dataTypeClass = Integer.class, required = true)
+    })
+    @PostMapping("/distribution")
+    @AuthHandler
+    public Result distribution(Integer id, Integer userId, Integer instrumentId) {
+        return Result.success(planService.distribution(id, userId, instrumentId));
+    }
+
+    @ApiOperation("妫�楠�")
+    @ApiImplicitParams(value = {
+            @ApiImplicitParam(name = "id", value = "妫�楠岄」鐩甶d", dataTypeClass = Integer.class, required = true),
+            @ApiImplicitParam(name = "value", value = "妫�楠屽��", dataTypeClass = String.class)
+    })
+    @PostMapping("/check")
+    @AuthHandler
+    public Result check(Integer id, String value) {
+        return Result.success(planService.check(id, value));
+    }
+
+    @ApiOperation("涓婃姤")
+    @ApiImplicitParams(value = {
+            @ApiImplicitParam(name = "id", value = "妫�楠屽崟id", dataTypeClass = Integer.class, required = true)
+    })
+    @PostMapping("/reported")
+    @AuthHandler
+    public Result reported(Integer id) {
+        return Result.success(planService.reported(id));
     }
 }

--
Gitblit v1.9.3