From cc59b65bc63b839127c29775bcd410dd407de66d Mon Sep 17 00:00:00 2001
From: shiyunteng <shiyunteng@example.com>
Date: 星期一, 21 四月 2025 17:20:02 +0800
Subject: [PATCH] 设备采购计划与设备照片
---
platformx-device-biz/src/main/java/com/by4cloud/platformx/device/controller/DeviceInventoryController.java | 34 ++++++++++++++++++++++++++++++++++
1 files changed, 34 insertions(+), 0 deletions(-)
diff --git a/platformx-device-biz/src/main/java/com/by4cloud/platformx/device/controller/DeviceInventoryController.java b/platformx-device-biz/src/main/java/com/by4cloud/platformx/device/controller/DeviceInventoryController.java
index 955925f..6a60a0b 100644
--- a/platformx-device-biz/src/main/java/com/by4cloud/platformx/device/controller/DeviceInventoryController.java
+++ b/platformx-device-biz/src/main/java/com/by4cloud/platformx/device/controller/DeviceInventoryController.java
@@ -10,6 +10,7 @@
import com.by4cloud.platformx.common.core.util.R;
import com.by4cloud.platformx.common.excel.annotation.ResponseExcel;
import com.by4cloud.platformx.common.log.annotation.SysLog;
+import com.by4cloud.platformx.device.entity.DeviceDemandPlan;
import com.by4cloud.platformx.device.entity.DeviceInventory;
import com.by4cloud.platformx.device.service.DeviceInventoryService;
import io.swagger.v3.oas.annotations.Operation;
@@ -51,6 +52,7 @@
wrapper.like(StringUtils.isNotBlank(deviceInventory.getDeviceNumber()),DeviceInventory::getDeviceNumber,deviceInventory.getDeviceNumber());
wrapper.like(StringUtils.isNotBlank(deviceInventory.getSerialNo()),DeviceInventory::getSerialNo,deviceInventory.getSerialNo());
wrapper.like(StringUtils.isNotBlank(deviceInventory.getName()),DeviceInventory::getName,deviceInventory.getName());
+ wrapper.orderByDesc(DeviceInventory::getCreateTime);
return R.ok(deviceInventoryService.page(page, wrapper));
}
@@ -143,4 +145,36 @@
public List<DeviceInventory> export(DeviceInventory deviceInventory,Long[] ids) {
return deviceInventoryService.list(Wrappers.lambdaQuery(deviceInventory).in(ArrayUtil.isNotEmpty(ids), DeviceInventory::getId, ids));
}
+
+ /**
+ * 璁惧涓嬫墍鏈夊簭鍒楀彿涓嬫媺
+ * @return
+ */
+ @GetMapping("/getDropdowmList/{deviceId}" )
+ public R getDeviceList(@PathVariable("deviceId")Long deviceId) {
+ QueryWrapper<DeviceInventory> queryWrapper = new QueryWrapper<>();
+ queryWrapper.eq("device_id",deviceId);
+ queryWrapper.eq("inventory_status","1");
+ return R.ok(deviceInventoryService.list(queryWrapper));
+ }
+
+ /**
+ * 绉熻祦鐘舵�佷笅鐨勮澶囩璧佽鎯�
+ * @return
+ */
+ @GetMapping("/getReleaseDetail/{id}" )
+ public R getReleaseDetail(@PathVariable("id")Long id) {
+ return deviceInventoryService.getReleaseDetail(id);
+ }
+
+ /**
+ * 淇敼搴撳瓨琛�
+ * @param deviceInventory 搴撳瓨琛�
+ * @return R
+ */
+ @SysLog("淇敼搴撳瓨琛�" )
+ @PutMapping("/uploadPic")
+ public R uploadPic(@RequestBody DeviceInventory deviceInventory) {
+ return R.ok(deviceInventoryService.updateById(deviceInventory));
+ }
}
--
Gitblit v1.9.1