From 47768d890fbfc1a5f3e93ca26137847361415e9e Mon Sep 17 00:00:00 2001
From: buhuazhen <hua100783@gmail.com>
Date: 星期二, 28 十月 2025 10:54:16 +0800
Subject: [PATCH] Merge branch 'master' into pim_meet
---
src/main/java/com/ruoyi/device/controller/DeviceLedgerController.java | 20 ++++++++++++--------
1 files changed, 12 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 0f90758..e3538d1 100644
--- a/src/main/java/com/ruoyi/device/controller/DeviceLedgerController.java
+++ b/src/main/java/com/ruoyi/device/controller/DeviceLedgerController.java
@@ -5,6 +5,8 @@
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.mapper.DeviceLedgerMapper;
+import com.ruoyi.device.mapper.DeviceMaintenanceMapper;
import com.ruoyi.device.pojo.DeviceLedger;
import com.ruoyi.device.pojo.DeviceMaintenance;
import com.ruoyi.device.service.IDeviceLedgerService;
@@ -13,6 +15,7 @@
import com.ruoyi.framework.web.domain.AjaxResult;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiModelProperty;
+import io.swagger.annotations.ApiOperation;
import org.apache.commons.lang3.ArrayUtils;
import org.ehcache.spi.service.MaintainableService;
import org.springframework.beans.factory.annotation.Autowired;
@@ -34,7 +37,10 @@
private IDeviceLedgerService deviceLedgerService;
@Autowired
- private IDeviceMaintenanceService deviceMaintenanceService;
+ private DeviceLedgerMapper deviceLedgerMapper;
+
+ @Autowired
+ private DeviceMaintenanceMapper deviceMaintenanceMapper;
@ApiModelProperty("璁惧鍙拌处鍒楄〃")
@GetMapping("/page")
@@ -96,17 +102,15 @@
}
@GetMapping("scanDevice")
- @ApiModelProperty("鑾峰彇璁惧鍙拌处")
+ @ApiOperation("鑾峰彇璁惧鍙拌处")
@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);
+ List<DeviceMaintenance> list = deviceMaintenanceMapper.list1(id);
+ DeviceLedger deviceLedger = deviceLedgerMapper.selectById1(id);
if (list.size()>0){
- deviceLedger.setUpdateTime(list.get(0).getMaintenanceActuallyTime());
- deviceLedger.setCreateTime(deviceLedger.getUpdateTime().plusMonths(1));
+ deviceLedger.setUpdateTime(list.get(0).getMaintenanceActuallyTime());//鏈�鍚庣淮鎶ゆ椂闂�
}
+ deviceLedger.setCreateTime(deviceLedger.getUpdateTime().plusMonths(1));//涓嬫缁存姢鏃堕棿
return AjaxResult.success(deviceLedger);
}
}
--
Gitblit v1.9.3