From a345181d12e99c5c16cd1d546b89680f73cc14ea Mon Sep 17 00:00:00 2001
From: zss <zss@example.com>
Date: 星期五, 29 八月 2025 17:08:15 +0800
Subject: [PATCH] 手机端扫描二维码能够查看设备情况的接口
---
src/main/java/com/ruoyi/device/controller/DeviceLedgerController.java | 24 ++++++++++++++++++++++++
1 files changed, 24 insertions(+), 0 deletions(-)
diff --git a/src/main/java/com/ruoyi/device/controller/DeviceLedgerController.java b/src/main/java/com/ruoyi/device/controller/DeviceLedgerController.java
index abac6a7..0f90758 100644
--- a/src/main/java/com/ruoyi/device/controller/DeviceLedgerController.java
+++ b/src/main/java/com/ruoyi/device/controller/DeviceLedgerController.java
@@ -2,14 +2,19 @@
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.baomidou.mybatisplus.core.toolkit.Wrappers;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.ruoyi.device.dto.DeviceLedgerDto;
import com.ruoyi.device.pojo.DeviceLedger;
+import com.ruoyi.device.pojo.DeviceMaintenance;
import com.ruoyi.device.service.IDeviceLedgerService;
+import com.ruoyi.device.service.IDeviceMaintenanceService;
+import com.ruoyi.framework.aspectj.lang.annotation.Anonymous;
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.ehcache.spi.service.MaintainableService;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.*;
import org.springframework.web.multipart.MultipartFile;
@@ -18,6 +23,7 @@
import java.io.IOException;
import java.util.ArrayList;
import java.util.Arrays;
+import java.util.List;
@Api(tags = "璁惧鍙拌处绠＄悊")
@RequestMapping("/device/ledger")
@@ -26,6 +32,9 @@
@Autowired
private IDeviceLedgerService deviceLedgerService;
+
+ @Autowired
+ private IDeviceMaintenanceService deviceMaintenanceService;
@ApiModelProperty("璁惧鍙拌处鍒楄〃")
@GetMapping("/page")
@@ -85,4 +94,19 @@
return AjaxResult.success(deviceLedgerService.list(new QueryWrapper<DeviceLedger>().lambda()
.select(DeviceLedger::getId, DeviceLedger::getDeviceName,DeviceLedger::getDeviceModel)));
}
+
+ @GetMapping("scanDevice")
+ @ApiModelProperty("鑾峰彇璁惧鍙拌处")
+ @Anonymous
+ public AjaxResult scanDevice(Long id) {
+ List<DeviceMaintenance> list = deviceMaintenanceService.list(Wrappers.<DeviceMaintenance>lambdaQuery()
+ .eq(DeviceMaintenance::getDeviceLedgerId, id)
+ .orderByDesc(DeviceMaintenance::getMaintenanceActuallyTime));
+ DeviceLedger deviceLedger = deviceLedgerService.getById(id);
+ if (list.size()>0){
+ deviceLedger.setUpdateTime(list.get(0).getMaintenanceActuallyTime());
+ deviceLedger.setCreateTime(deviceLedger.getUpdateTime().plusMonths(1));
+ }
+ return AjaxResult.success(deviceLedger);
+ }
}
--
Gitblit v1.9.3