From d8a687741273d121586b83745280c57f7e9d3297 Mon Sep 17 00:00:00 2001
From: XiaoRuby <3114200645@qq.com>
Date: 星期一, 07 八月 2023 17:51:28 +0800
Subject: [PATCH] Merge branch 'master' of https://gitee.com/yuanchu_code/lims-management-system

---
 laboratory-server/src/main/java/com/yuanchu/limslaboratory/controller/MeteringPlanController.java |   70 +++++++++++++++++++++++++++++++++++
 1 files changed, 70 insertions(+), 0 deletions(-)

diff --git a/laboratory-server/src/main/java/com/yuanchu/limslaboratory/controller/MeteringPlanController.java b/laboratory-server/src/main/java/com/yuanchu/limslaboratory/controller/MeteringPlanController.java
new file mode 100644
index 0000000..bc6ea21
--- /dev/null
+++ b/laboratory-server/src/main/java/com/yuanchu/limslaboratory/controller/MeteringPlanController.java
@@ -0,0 +1,70 @@
+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.Instrument;
+import com.yuanchu.limslaboratory.pojo.MeteringPlan;
+import com.yuanchu.limslaboratory.service.MeteringPlanService;
+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 java.util.Map;
+import java.util.Objects;
+
+/**
+ * <p>
+ *  鍓嶇鎺у埗鍣�
+ * </p>
+ *
+ * @author 姹熻嫃榈烽洀缃戠粶绉戞妧鏈夐檺鍏徃
+ * @since 2023-07-27
+ */
+@Api(tags = "瀹為獙瀹�-->2銆佽閲忕鐞�")
+@RestController
+@RequestMapping("/metering-plan")
+public class MeteringPlanController {
+
+    @Autowired
+    private MeteringPlanService meteringPlanService;
+
+    @ApiOperation("娣诲姞璁¢噺璁″垝")
+    @PostMapping("/add")
+    public Result<?> addMeteringPlanInformation(@RequestBody MeteringPlan meteringPlan) {
+        Integer isInsertSuccess = meteringPlanService.addMeteringPlanInformation(meteringPlan);
+        if (isInsertSuccess == 1){
+            return Result.success("娣诲姞璁¢噺璁″垝鎴愬姛!");
+        }
+        return Result.fail("娣诲姞璁¢噺璁″垝澶辫触! ");
+    }
+
+    @ApiOperation("璁¢噺璁″垝鍒嗛〉鏌ヨ")
+    @ApiImplicitParams(value = {
+            @ApiImplicitParam(name = "pageNo", value = "璧峰椤�", dataTypeClass = Integer.class, required = true),
+            @ApiImplicitParam(name = "pageSize", value = "姣忎竴椤垫暟閲�", dataTypeClass = Integer.class, required = true),
+            @ApiImplicitParam(name = "measureCodeOrNameOrUnit", value = "姣忎竴椤垫暟閲�", dataTypeClass = Integer.class, required = true)
+    })
+    @GetMapping("/plan_page_list")
+    public Result<?> pagingQueryOfMeteringPlan(Integer pageNo, Integer pageSize, String measureCodeOrNameOrUnit) {
+        IPage<Map<String, Object>> page = meteringPlanService.pagingQueryOfMeteringPlan(measureCodeOrNameOrUnit, new Page<Objects>(pageNo, pageSize));
+        return Result.success(page);
+    }
+
+    @ApiOperation("璁¢噺鍙拌处鍒嗛〉鏌ヨ")
+    @ApiImplicitParams(value = {
+            @ApiImplicitParam(name = "pageNo", value = "璧峰椤�", dataTypeClass = Integer.class, required = true),
+            @ApiImplicitParam(name = "pageSize", value = "姣忎竴椤垫暟閲�", dataTypeClass = Integer.class, required = true)
+    })
+    @GetMapping("/standing_page_list")
+    public Result<?> pagingQueryOfMeasurementLedger(Integer pageNo, Integer pageSize) {
+        IPage<Map<String, Object>> page = meteringPlanService.pagingQueryOfMeasurementLedger(new Page<Objects>(pageNo, pageSize));
+        return Result.success(page);
+    }
+}

--
Gitblit v1.9.3