From fc8c86e7a365d5c6bdc37c2b05b9f83115ac2bc3 Mon Sep 17 00:00:00 2001
From: shiyunteng <shiyunteng@example.com>
Date: 星期三, 23 四月 2025 17:30:52 +0800
Subject: [PATCH] 巡检任务 设备维修新增是否生成工单
---
platformx-device-biz/src/main/java/com/by4cloud/platformx/device/controller/DeviceInventoryController.java | 39 ++++++++++++++++++++++++++++++++++++++-
1 files changed, 38 insertions(+), 1 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 9c25d1a..f6b9bc9 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
@@ -2,6 +2,7 @@
import cn.hutool.core.collection.CollUtil;
import cn.hutool.core.util.ArrayUtil;
+import cn.hutool.core.util.StrUtil;
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.core.toolkit.StringUtils;
@@ -52,6 +53,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.eq(StringUtils.checkValNotNull(deviceInventory.getInventoryStatus()),DeviceInventory::getInventoryStatus,deviceInventory.getInventoryStatus());
wrapper.orderByDesc(DeviceInventory::getCreateTime);
return R.ok(deviceInventoryService.page(page, wrapper));
}
@@ -147,13 +149,26 @@
}
/**
- * 璁惧涓嬫墍鏈夊簭鍒楀彿涓嬫媺
+ * 璁惧涓嬫墍鏈夊彲鐢ㄥ簭鍒楀彿涓嬫媺
* @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("/getDropdowmScrapList/{deviceId}" )
+ public R getDropdowmScrapList(@PathVariable("deviceId")Long deviceId) {
+ QueryWrapper<DeviceInventory> queryWrapper = new QueryWrapper<>();
+ queryWrapper.eq("device_id",deviceId);
+ queryWrapper.eq("inventory_status","4");
return R.ok(deviceInventoryService.list(queryWrapper));
}
@@ -165,4 +180,26 @@
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));
+ }
+
+ /**
+ * 淇敼搴撳瓨琛�
+ * @param id 搴撳瓨琛�
+ * @return R
+ */
+ @SysLog("璁惧褰掕繕鍏ュ簱" )
+ @GetMapping("/return/{id}")
+ public R returnDevice(@PathVariable("id")Long id) {
+ return deviceInventoryService.returnDevice(id);
+ }
}
--
Gitblit v1.9.1