From c8fbeff3b07f96ffb4624dd64344ac00ec0c8ef8 Mon Sep 17 00:00:00 2001
From: liding <756868258@qq.com>
Date: 星期五, 18 七月 2025 11:03:47 +0800
Subject: [PATCH] 1.优化正式库 2.yml设置
---
main-business/src/main/java/com/ruoyi/business/controller/OfficialInventoryController.java | 23 +++++++++++++++++++++--
1 files changed, 21 insertions(+), 2 deletions(-)
diff --git a/main-business/src/main/java/com/ruoyi/business/controller/OfficialInventoryController.java b/main-business/src/main/java/com/ruoyi/business/controller/OfficialInventoryController.java
index 196e7ad..bdddb30 100644
--- a/main-business/src/main/java/com/ruoyi/business/controller/OfficialInventoryController.java
+++ b/main-business/src/main/java/com/ruoyi/business/controller/OfficialInventoryController.java
@@ -3,10 +3,12 @@
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.ruoyi.business.dto.OfficialInventoryDto;
+import com.ruoyi.business.entity.OfficialInventory;
import com.ruoyi.business.service.OfficialInventoryService;
import com.ruoyi.business.vo.OfficialInventoryVo;
import com.ruoyi.common.core.domain.R;
import lombok.AllArgsConstructor;
+import lombok.extern.slf4j.Slf4j;
import org.springframework.web.bind.annotation.*;
import java.util.List;
@@ -22,6 +24,7 @@
@RestController
@AllArgsConstructor
+@Slf4j
@RequestMapping("/officialInventory")
public class OfficialInventoryController {
@@ -31,7 +34,7 @@
* 姝ｅ紡搴撳簱琛ㄦ煡璇�
*/
@GetMapping("/list")
- public R<IPage<OfficialInventoryDto>> list(Page page, OfficialInventoryDto officialInventoryDto) {
+ public R<IPage<OfficialInventoryDto>> list(Page<OfficialInventory> page, OfficialInventoryDto officialInventoryDto) {
IPage<OfficialInventoryDto> list = officialInventoryService.selectOfficialInventoryList(page, officialInventoryDto);
return R.ok(list);
}
@@ -39,9 +42,17 @@
/**
* 姝ｅ紡搴撶叅绉嶉儴鍒嗕俊鎭痩ist
*/
- @GetMapping("/OfficialList")
+ @GetMapping("/officialList")
public R<List<OfficialInventoryVo>> officialList(OfficialInventoryVo officialInventoryVo) {
return R.ok(officialInventoryService.selectOfficialList(officialInventoryVo));
+ }
+
+ /**
+ * 姝ｅ紡搴撶叅绉嶇敓浜у姞宸ラ�夋嫨list
+ */
+ @GetMapping("/officialAll")
+ public R<List<OfficialInventory>> officialAll() {
+ return R.ok(officialInventoryService.selectOfficialAll());
}
/**
@@ -52,6 +63,7 @@
return R.ok(officialInventoryService.editOfficial(officialInventoryDto));
}
+
/**
* 鍚堝苟
*/
@@ -60,4 +72,11 @@
return R.ok(officialInventoryService.mergeAll(officialInventoryDto));
}
+ /**
+ * 閰嶇叅璁＄畻鍣ㄩ�夋嫨list
+ */
+ @GetMapping("/coalBlendingList")
+ public R<List<OfficialInventoryDto>> coalBlendingList() {
+ return R.ok(officialInventoryService.coalBlendingList());
+ }
}
--
Gitblit v1.9.3