From 1d2933b4209f891d7dbd431ba44577c7d5e5eef4 Mon Sep 17 00:00:00 2001
From: maven <2163098428@qq.com>
Date: 星期一, 22 九月 2025 11:40:18 +0800
Subject: [PATCH] yys 配置文件修改
---
main-business/src/main/java/com/ruoyi/business/controller/OfficialInventoryController.java | 63 +++++++++++++++++++++++++++++--
1 files changed, 58 insertions(+), 5 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 b9cac2d..45c9060 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,13 +3,17 @@
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.dto.SalesRecordDto;
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 jakarta.servlet.http.HttpServletResponse;
import lombok.AllArgsConstructor;
-import org.springframework.web.bind.annotation.GetMapping;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RestController;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.web.bind.annotation.*;
+
+import java.util.List;
/**
* <p>
@@ -22,6 +26,7 @@
@RestController
@AllArgsConstructor
+@Slf4j
@RequestMapping("/officialInventory")
public class OfficialInventoryController {
@@ -31,9 +36,57 @@
* 姝ｅ紡搴撳簱琛ㄦ煡璇�
*/
@GetMapping("/list")
- public R<IPage<OfficialInventory>> list(Page page, OfficialInventoryDto officialInventoryDto) {
- IPage<OfficialInventory> list = officialInventoryService.selectOfficialInventoryList(page,officialInventoryDto);
+ public R<IPage<OfficialInventoryDto>> list(Page<OfficialInventory> page, OfficialInventoryDto officialInventoryDto) {
+ IPage<OfficialInventoryDto> list = officialInventoryService.selectOfficialInventoryList(page, officialInventoryDto);
return R.ok(list);
}
+ /**
+ * 姝ｅ紡搴撶叅绉嶉儴鍒嗕俊鎭痩ist
+ */
+ @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());
+ }
+
+ /**
+ * 姝ｅ紡搴撲慨鏀�
+ */
+ @PostMapping("/editOfficial")
+ public R editOfficial(@RequestBody OfficialInventoryDto officialInventoryDto) {
+ return R.ok(officialInventoryService.editOfficial(officialInventoryDto));
+ }
+
+
+ /**
+ * 鍚堝苟
+ */
+ @PostMapping("/merge")
+ public R merge(@RequestBody OfficialInventoryDto officialInventoryDto) {
+ return R.ok(officialInventoryService.mergeAll(officialInventoryDto));
+ }
+
+ /**
+ * 閰嶇叅璁＄畻鍣ㄩ�夋嫨list
+ */
+ @GetMapping("/coalBlendingList")
+ public R<List<OfficialInventoryDto>> coalBlendingList() {
+ return R.ok(officialInventoryService.coalBlendingList());
+ }
+
+ /**
+ * 姝ｅ紡搴撹褰曡〃瀵煎嚭
+ */
+ @PostMapping("/export")
+ public void officialInventoryExport(HttpServletResponse response, OfficialInventoryDto officialInventoryDto) {
+ officialInventoryService.officialInventoryExport(response, officialInventoryDto);
+ }
}
--
Gitblit v1.9.3