From 5b42f516687fdacd23bc0efd6a7ceab1d2c95ded Mon Sep 17 00:00:00 2001
From: 云 <2163098428@qq.com>
Date: 星期一, 30 三月 2026 11:45:39 +0800
Subject: [PATCH] yys 转移设备代码
---
src/main/java/com/ruoyi/device/controller/DeviceLedgerController.java | 40 +++++++++++++++++++++++++++-------------
1 files changed, 27 insertions(+), 13 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..c0d89df 100644
--- a/src/main/java/com/ruoyi/device/controller/DeviceLedgerController.java
+++ b/src/main/java/com/ruoyi/device/controller/DeviceLedgerController.java
@@ -2,19 +2,22 @@
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.common.utils.poi.ExcelUtil;
import com.ruoyi.device.dto.DeviceLedgerDto;
+import com.ruoyi.device.execl.DeviceLedgerExeclDto;
+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;
-import com.ruoyi.device.service.IDeviceMaintenanceService;
import com.ruoyi.framework.aspectj.lang.annotation.Anonymous;
+import com.ruoyi.framework.aspectj.lang.annotation.Log;
+import com.ruoyi.framework.aspectj.lang.enums.BusinessType;
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 io.swagger.annotations.ApiOperation;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.*;
import org.springframework.web.multipart.MultipartFile;
@@ -22,7 +25,6 @@
import javax.servlet.http.HttpServletResponse;
import java.io.IOException;
import java.util.ArrayList;
-import java.util.Arrays;
import java.util.List;
@Api(tags = "璁惧鍙拌处绠＄悊")
@@ -34,7 +36,12 @@
private IDeviceLedgerService deviceLedgerService;
@Autowired
- private IDeviceMaintenanceService deviceMaintenanceService;
+ private DeviceLedgerMapper deviceLedgerMapper;
+
+ @Autowired
+ private DeviceMaintenanceMapper deviceMaintenanceMapper;
+
+
@ApiModelProperty("璁惧鍙拌处鍒楄〃")
@GetMapping("/page")
@@ -79,12 +86,21 @@
@PostMapping("import")
@ApiModelProperty("瀵煎叆璁惧鍙拌处")
+ @Log(title = "璁惧鍙拌处瀵煎叆", businessType = BusinessType.IMPORT)
public AjaxResult importData(MultipartFile file) throws IOException {
Boolean b = deviceLedgerService.importData(file);
if (b) {
return AjaxResult.success("瀵煎叆鎴愬姛");
}
return AjaxResult.error("瀵煎叆澶辫触");
+ }
+
+ @PostMapping("/downloadTemplate")
+ @ApiModelProperty("涓嬭浇瀵煎叆妯℃澘")
+ @Log(title = "璁惧鍙拌处瀵煎叆", businessType = BusinessType.IMPORT)
+ public void downloadTemplate(HttpServletResponse response) {
+ ExcelUtil<DeviceLedgerExeclDto> util = new ExcelUtil<DeviceLedgerExeclDto>(DeviceLedgerExeclDto.class);
+ util.importTemplateExcel(response, "璁惧鍙拌处妯℃澘");
}
@@ -96,17 +112,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