From d17d4d1ac98865d2a71b4f24771b7b76e0839ed3 Mon Sep 17 00:00:00 2001
From: 云 <2163098428@qq.com>
Date: 星期五, 10 四月 2026 14:08:41 +0800
Subject: [PATCH] yys 1.设备区域 2.设备巡检，维保，保养多选 3.数采
---
src/main/java/com/ruoyi/device/service/impl/DeviceMaintenanceServiceImpl.java | 84 +++++++++++++++++++++++++++--------------
1 files changed, 55 insertions(+), 29 deletions(-)
diff --git a/src/main/java/com/ruoyi/device/service/impl/DeviceMaintenanceServiceImpl.java b/src/main/java/com/ruoyi/device/service/impl/DeviceMaintenanceServiceImpl.java
index a5005af..b0c655a 100644
--- a/src/main/java/com/ruoyi/device/service/impl/DeviceMaintenanceServiceImpl.java
+++ b/src/main/java/com/ruoyi/device/service/impl/DeviceMaintenanceServiceImpl.java
@@ -1,6 +1,5 @@
package com.ruoyi.device.service.impl;
-
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
@@ -9,7 +8,9 @@
import com.ruoyi.device.dto.DeviceMaintenanceDto;
import com.ruoyi.device.execl.DeviceMaintenanceExeclDto;
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.web.domain.AjaxResult;
import com.ruoyi.measuringinstrumentledger.mapper.SparePartsMapper;
@@ -24,13 +25,11 @@
import javax.servlet.http.HttpServletResponse;
import java.math.BigDecimal;
import java.util.ArrayList;
+import java.util.Arrays;
import java.util.List;
-
@Service
public class DeviceMaintenanceServiceImpl extends ServiceImpl<DeviceMaintenanceMapper, DeviceMaintenance> implements IDeviceMaintenanceService {
-
-
@Autowired
private DeviceMaintenanceMapper deviceMaintenanceMapper;
@@ -38,43 +37,42 @@
private SparePartsMapper sparePartsMapper;
@Autowired
private SparePartsRequisitionRecordService sparePartsRequisitionRecordService;
+ @Autowired
+ private IDeviceLedgerService deviceLedgerService;
@Override
public IPage<DeviceMaintenanceDto> queryPage(Page page, DeviceMaintenanceDto deviceMaintenanceDto) {
-
return deviceMaintenanceMapper.queryPage(page, deviceMaintenanceDto);
}
@Override
public AjaxResult saveDeviceRepair(DeviceMaintenance deviceMaintenance) {
- boolean save = this.save(deviceMaintenance);
- if (save){
- return AjaxResult.success();
+ List<DeviceMaintenance> records = buildMaintenanceRecords(deviceMaintenance);
+ if (records.isEmpty()) {
+ return AjaxResult.error("璇烽�夋嫨璁惧");
}
- return AjaxResult.error();
+ return this.saveBatch(records) ? AjaxResult.success() : AjaxResult.error();
}
@Override
@Transactional(rollbackFor = Exception.class)
public AjaxResult updateDeviceDeviceMaintenance(DeviceMaintenance deviceMaintenance) {
DeviceMaintenance oldDeviceMaintenance = this.getById(deviceMaintenance.getId());
- // 澶勭悊澶囦欢浣跨敤鎯呭喌
+ if (oldDeviceMaintenance == null) {
+ return AjaxResult.error("淇濆吇璁板綍涓嶅瓨鍦�");
+ }
if (com.github.xiaoymin.knife4j.core.util.CollectionUtils.isNotEmpty(deviceMaintenance.getSparePartsUseList())) {
List<Long> sparePartIds = new ArrayList<>();
for (DeviceMaintenance.SparePartUse sparePartUse : deviceMaintenance.getSparePartsUseList()) {
- // 鑾峰彇澶囦欢淇℃伅
SpareParts spareParts = sparePartsMapper.selectById(sparePartUse.getId());
if (spareParts != null) {
- // 妫�鏌ユ暟閲忔槸鍚﹁冻澶�
if (spareParts.getQuantity().compareTo(new BigDecimal(sparePartUse.getQuantity())) >= 0) {
- // 鏇存柊鏁伴噺
spareParts.setQuantity(spareParts.getQuantity().subtract(new BigDecimal(sparePartUse.getQuantity())));
sparePartsMapper.updateById(spareParts);
sparePartIds.add(sparePartUse.getId());
- // 鍒涘缓澶囦欢棰嗙敤璁板綍
SparePartsRequisitionRecord record = new SparePartsRequisitionRecord();
- record.setSourceType(1); // 1 淇濆吇
+ record.setSourceType(1);
record.setSourceId(deviceMaintenance.getId());
record.setDeviceLedgerId(oldDeviceMaintenance.getDeviceLedgerId());
record.setSparePartsId(sparePartUse.getId());
@@ -85,36 +83,64 @@
}
}
}
- // 鏇存柊澶囦欢IDs瀛楁
if (!sparePartIds.isEmpty()) {
deviceMaintenance.setSparePartsIds(StringUtils.join(sparePartIds, ","));
}
}
- if (this.updateById(deviceMaintenance)) {
- return AjaxResult.success();
- }
- return AjaxResult.error();
+ return this.updateById(deviceMaintenance) ? AjaxResult.success() : AjaxResult.error();
}
@Override
public void export(HttpServletResponse response, Long[] ids) {
List<DeviceMaintenance> supplierManageList = deviceMaintenanceMapper.selectList(null);
- ArrayList<DeviceMaintenanceExeclDto> deviceLedgerExeclDtos = new ArrayList<>();
+ ArrayList<DeviceMaintenanceExeclDto> result = new ArrayList<>();
supplierManageList.forEach(deviceMaintenance -> {
- DeviceMaintenanceExeclDto deviceRepairExeclDto = new DeviceMaintenanceExeclDto();
- BeanUtils.copyProperties(deviceMaintenance,deviceRepairExeclDto);
- deviceRepairExeclDto.setStatus(deviceMaintenance.getStatus() == 0 ? "寰呯淮淇�" : deviceMaintenance.getStatus() == 1 ? "瀹岀粨" : "澶辫触");
-// deviceRepairExeclDto.setMaintenanceResult(deviceMaintenance.getMaintenanceResult() != null && deviceMaintenance.getMaintenanceResult() == 0 ? "缁翠慨" : "瀹屽ソ");
- deviceLedgerExeclDtos.add(deviceRepairExeclDto);
+ DeviceMaintenanceExeclDto dto = new DeviceMaintenanceExeclDto();
+ BeanUtils.copyProperties(deviceMaintenance, dto);
+ dto.setStatus(deviceMaintenance.getStatus() == 0 ? "寰呯淮淇�" : deviceMaintenance.getStatus() == 1 ? "瀹岀粨" : "澶辫触");
+ result.add(dto);
});
- ExcelUtil<DeviceMaintenanceExeclDto> util = new ExcelUtil<DeviceMaintenanceExeclDto>(DeviceMaintenanceExeclDto.class);
- util.exportExcel(response, deviceLedgerExeclDtos, "璁惧鎶ヤ慨瀵煎嚭");
+ ExcelUtil<DeviceMaintenanceExeclDto> util = new ExcelUtil<>(DeviceMaintenanceExeclDto.class);
+ util.exportExcel(response, result, "璁惧淇濆吇瀵煎嚭");
}
@Override
public DeviceMaintenanceDto detailById(Long id) {
-
return deviceMaintenanceMapper.detailById(id);
}
+
+ private List<DeviceMaintenance> buildMaintenanceRecords(DeviceMaintenance source) {
+ Long[] deviceIds = source.getDeviceLedgerIds();
+ if (deviceIds == null || deviceIds.length == 0) {
+ deviceIds = source.getDeviceLedgerId() == null ? new Long[0] : new Long[]{source.getDeviceLedgerId()};
+ }
+ List<DeviceMaintenance> records = new ArrayList<>();
+ Arrays.stream(deviceIds).distinct().forEach(deviceId -> {
+ DeviceLedger deviceLedger = deviceLedgerService.getById(deviceId);
+ if (deviceLedger == null) {
+ return;
+ }
+ int quantity = resolveQuantity(deviceLedger);
+ for (int i = 0; i < quantity; i++) {
+ DeviceMaintenance record = new DeviceMaintenance();
+ BeanUtils.copyProperties(source, record);
+ record.setId(null);
+ record.setDeviceLedgerIds(null);
+ record.setDeviceLedgerId(deviceLedger.getId());
+ record.setAreaId(deviceLedger.getAreaId());
+ record.setDeviceName(deviceLedger.getDeviceName());
+ record.setDeviceModel(deviceLedger.getDeviceModel());
+ records.add(record);
+ }
+ });
+ return records;
+ }
+
+ private int resolveQuantity(DeviceLedger deviceLedger) {
+ if (deviceLedger == null || deviceLedger.getNumber() == null || deviceLedger.getNumber().compareTo(BigDecimal.ONE) < 0) {
+ return 1;
+ }
+ return Math.max(1, deviceLedger.getNumber().intValue());
+ }
}
--
Gitblit v1.9.3