From 45fa0764c539a1164affc0937a6870fe988bf2c8 Mon Sep 17 00:00:00 2001
From: lishenao <3065849776@qq.com>
Date: 星期三, 25 六月 2025 14:22:35 +0800
Subject: [PATCH] 包名优化
---
src/main/java/com/ruoyi/device/controller/DeviceLedgerController.java | 38 ++++++++++++++++++++++++++++++--------
1 files changed, 30 insertions(+), 8 deletions(-)
diff --git a/src/main/java/com/ruoyi/device/controller/DeviceLedgerController.java b/src/main/java/com/ruoyi/device/controller/DeviceLedgerController.java
index ea8dd73..b3f283a 100644
--- a/src/main/java/com/ruoyi/device/controller/DeviceLedgerController.java
+++ b/src/main/java/com/ruoyi/device/controller/DeviceLedgerController.java
@@ -1,17 +1,22 @@
package com.ruoyi.device.controller;
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.ruoyi.device.dto.DeviceLedgerDto;
import com.ruoyi.device.pojo.DeviceLedger;
import com.ruoyi.device.service.IDeviceLedgerService;
import com.ruoyi.framework.web.domain.AjaxResult;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiModelProperty;
+import org.apache.commons.lang3.ArrayUtils;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.*;
+import org.springframework.web.multipart.MultipartFile;
import javax.servlet.http.HttpServletResponse;
import java.util.ArrayList;
+import java.util.Arrays;
@Api(tags = "璁惧鍙拌处绠＄悊")
@RequestMapping("/device/ledger")
@@ -23,13 +28,13 @@
@ApiModelProperty("璁惧鍙拌处鍒楄〃")
@GetMapping("/page")
- public AjaxResult page(Page page , DeviceLedger deviceLedger) {
+ public AjaxResult page(Page page , DeviceLedgerDto deviceLedger) {
return AjaxResult.success(deviceLedgerService.queryPage(page,deviceLedger));
}
@PostMapping()
@ApiModelProperty("娣诲姞璁惧鍙拌处")
- public AjaxResult add(DeviceLedger deviceLedger) {
+ public AjaxResult add(@RequestBody DeviceLedger deviceLedger) {
return deviceLedgerService.saveDeviceLedger(deviceLedger);
}
@@ -42,14 +47,13 @@
@PutMapping ()
@ApiModelProperty("淇敼璁惧鍙拌处")
- public AjaxResult update(DeviceLedger deviceLedger) {
-
+ public AjaxResult update(@RequestBody DeviceLedger deviceLedger) {
return deviceLedgerService.updateDeviceLedger(deviceLedger);
}
- @DeleteMapping("/{id}")
+ @DeleteMapping("/{ids}")
@ApiModelProperty("鍒犻櫎璁惧鍙拌处")
- public AjaxResult delete(@PathVariable ArrayList<Long> ids) {
+ public AjaxResult delete(@PathVariable("ids") ArrayList<Long> ids) {
boolean b = deviceLedgerService.removeBatchByIds(ids);
if (!b) {
return AjaxResult.error("鍒犻櫎澶辫触");
@@ -57,9 +61,27 @@
return AjaxResult.success();
}
- @GetMapping("export")
+ @PostMapping("export")
@ApiModelProperty("瀵煎嚭璁惧鍙拌处")
- public void export(HttpServletResponse response, ArrayList<Long> ids) {
+ public void export(HttpServletResponse response, Long[] ids) {
deviceLedgerService.export(response, ids);
}
+
+ @PostMapping("import")
+ @ApiModelProperty("瀵煎叆璁惧鍙拌处")
+ public AjaxResult importData(MultipartFile file) {
+ Boolean b = deviceLedgerService.importData(file);
+ if (b) {
+ return AjaxResult.success("瀵煎叆鎴愬姛");
+ }
+ return AjaxResult.error("瀵煎叆澶辫触");
+ }
+
+
+ @GetMapping("getDeviceLedger")
+ @ApiModelProperty("鑾峰彇璁惧鍙拌处")
+ public AjaxResult getDeviceLedger( ) {
+ return AjaxResult.success(deviceLedgerService.list(new QueryWrapper<DeviceLedger>().lambda()
+ .select(DeviceLedger::getId, DeviceLedger::getDeviceName,DeviceLedger::getDeviceModel)));
+ }
}
--
Gitblit v1.9.3