From 66ff6f509bbbba04cffc428e7e1c886b534b4f13 Mon Sep 17 00:00:00 2001
From: XiaoRuby <3114200645@qq.com>
Date: 星期四, 17 八月 2023 17:09:41 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
inspect-server/src/main/java/com/yuanchu/mom/controller/MeasureLedgerController.java | 52 ++++++++++++++++++++++++++++++++++++++++++++++++++++
1 files changed, 52 insertions(+), 0 deletions(-)
diff --git a/inspect-server/src/main/java/com/yuanchu/mom/controller/MeasureLedgerController.java b/inspect-server/src/main/java/com/yuanchu/mom/controller/MeasureLedgerController.java
new file mode 100644
index 0000000..b7546e6
--- /dev/null
+++ b/inspect-server/src/main/java/com/yuanchu/mom/controller/MeasureLedgerController.java
@@ -0,0 +1,52 @@
+package com.yuanchu.mom.controller;
+
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.yuanchu.mom.service.MeasureLedgerService;
+import com.yuanchu.mom.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.GetMapping;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.stereotype.Controller;
+import org.springframework.web.bind.annotation.RestController;
+
+import java.util.HashMap;
+import java.util.Map;
+
+/**
+ * <p>
+ * 鍓嶇鎺у埗鍣�
+ * </p>
+ *
+ * @author 姹熻嫃榈烽洀缃戠粶绉戞妧鏈夐檺鍏徃
+ * @since 2023-08-16 11:41:09
+ */
+@Api(tags = "QMS绠＄悊-->璁￠噺绠＄悊")
+@RestController
+@RequestMapping("/measureLedger")
+public class MeasureLedgerController {
+
+ @Autowired
+ private MeasureLedgerService measureLedgerService;
+
+ @ApiOperation(value = "璁￠噺棰勬祴-->鍒嗛〉琛ㄦ牸")
+ @ApiImplicitParams(value = {
+ @ApiImplicitParam(name = "pageNo", value = "鏉℃暟/椤�", dataTypeClass = Integer.class, required = true),
+ @ApiImplicitParam(name = "pageSize", value = "椤垫暟", dataTypeClass = Integer.class, required = true),
+ @ApiImplicitParam(name = "code", value = "璁￠噺缂栧彿", dataTypeClass = String.class),
+ @ApiImplicitParam(name = "deviceName", value = "浠櫒璁惧鍚嶇О", dataTypeClass = String.class),
+ @ApiImplicitParam(name = "meteringUnit", value = "璁￠噺鍗曚綅", dataTypeClass = String.class)
+ })
+ @GetMapping("/metering_table")
+ public Result<?> selectMeasureLedger(Integer pageNo, Integer pageSize, String code, String deviceName, String meteringUnit){
+ IPage<Map<String, Object>> maps = measureLedgerService.selectMeasureLedger(new Page<Object>(pageNo, pageSize), code, deviceName, meteringUnit);
+ Map<String, Object> map = new HashMap<>();
+ map.put("row", maps.getRecords());
+ map.put("total", maps.getTotal());
+ return Result.success(map);
+ }
+}
--
Gitblit v1.9.3