From f29c8786807015d78b9be8a33397f69478d92a76 Mon Sep 17 00:00:00 2001
From: liding <756868258@qq.com>
Date: 星期六, 12 七月 2025 16:52:27 +0800
Subject: [PATCH] 1.设备优化 2.配煤计算器

---
 main-business/src/main/java/com/ruoyi/business/service/impl/EquipmentUsageRecordServiceImpl.java |   70 +++++++++++++++++++++++++++++++++-
 1 files changed, 67 insertions(+), 3 deletions(-)

diff --git a/main-business/src/main/java/com/ruoyi/business/service/impl/EquipmentUsageRecordServiceImpl.java b/main-business/src/main/java/com/ruoyi/business/service/impl/EquipmentUsageRecordServiceImpl.java
index a1d8661..7b78a37 100644
--- a/main-business/src/main/java/com/ruoyi/business/service/impl/EquipmentUsageRecordServiceImpl.java
+++ b/main-business/src/main/java/com/ruoyi/business/service/impl/EquipmentUsageRecordServiceImpl.java
@@ -4,6 +4,7 @@
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.ruoyi.basic.entity.Supply;
+import com.ruoyi.basic.mapper.CoalInfoMapper;
 import com.ruoyi.business.dto.EquipmentManagementDto;
 import com.ruoyi.business.dto.EquipmentUsageRecordDto;
 import com.ruoyi.business.entity.EquipmentManagement;
@@ -12,9 +13,12 @@
 import com.ruoyi.business.mapper.EquipmentUsageRecordMapper;
 import com.ruoyi.business.service.EquipmentUsageRecordService;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.ruoyi.common.core.domain.entity.SysUser;
 import com.ruoyi.common.utils.bean.BeanUtils;
+import com.ruoyi.system.mapper.SysUserMapper;
 import org.springframework.stereotype.Service;
 import lombok.RequiredArgsConstructor;
+import org.springframework.transaction.annotation.Transactional;
 
 import java.util.HashMap;
 import java.util.List;
@@ -37,7 +41,9 @@
 
     private final EquipmentUsageRecordMapper equipmentUsageRecordMapper;
 
-    private  final EquipmentManagementMapper equipmentManagementMapper;
+    private final EquipmentManagementMapper equipmentManagementMapper;
+
+    private final SysUserMapper sysUserMapper;
 
     @Override
     public IPage<EquipmentUsageRecordDto> selectUsageRecordList(Page<EquipmentUsageRecord> page, EquipmentUsageRecordDto equipmentUsageRecordDto) {
@@ -46,7 +52,8 @@
         BeanUtils.copyProperties(entityPage, dtoPage);
 
         List<Long> eqIds = entityPage.getRecords().stream().map(EquipmentUsageRecord::getEquipmentId).toList();
-        //鎵归噺鏌ヨ
+        List<Long> userIds = entityPage.getRecords().stream().map(EquipmentUsageRecord::getUserId).toList();
+        //鎵归噺鏌ヨ璁惧
         Map<Long, EquipmentManagement> equipmentManagementMap;
         if (!eqIds.isEmpty()) {
             List<EquipmentManagement> infos = equipmentManagementMapper.selectList(new LambdaQueryWrapper<EquipmentManagement>().in(EquipmentManagement::getId, eqIds));
@@ -54,15 +61,26 @@
         } else {
             equipmentManagementMap = new HashMap<>();
         }
+        //浜哄憳鏌ヨ
+        Map<Long, SysUser> userMap;
+        if (!userIds.isEmpty()) {
+            List<SysUser> sysUsers = sysUserMapper.selectList(userIds);
+            userMap = sysUsers.stream().collect(Collectors.toMap(SysUser::getUserId, Function.identity()));
+        }else {
+            userMap = new HashMap<>();
+        }
         //鍖归厤鏁版嵁
         List<EquipmentUsageRecordDto> dtoRecords = entityPage.getRecords().stream().map(entity -> {
             EquipmentUsageRecordDto dto = new EquipmentUsageRecordDto();
             BeanUtils.copyProperties(entity, dto);
-
             EquipmentManagement equipment = equipmentManagementMap.get(entity.getEquipmentId());
             if (equipment != null) {
                 dto.setEquipmentNo(equipment.getEquipmentNo());
                 dto.setEquipmentName(equipment.getEquipmentName());
+            }
+            SysUser sysUser = userMap.get(entity.getUserId());
+            if (sysUser != null) {
+                dto.setUserName(sysUser.getNickName());
             }
             return dto;
         }).toList();
@@ -72,12 +90,58 @@
     }
 
     @Override
+    @Transactional(rollbackFor = Exception.class)
     public int addOrEditUsageRecord(EquipmentUsageRecordDto equipmentUsageRecordDto) {
         EquipmentUsageRecord equipmentUsageRecord = new EquipmentUsageRecord();
         BeanUtils.copyProperties(equipmentUsageRecordDto, equipmentUsageRecord);
+
+        // 鑾峰彇璁惧ID鍜岄鐢ㄦ暟閲�
+        Long equipmentId = equipmentUsageRecordDto.getEquipmentId();
+        Integer newUsageQuantity = equipmentUsageRecordDto.getUsageQuantity();
+
+        // 鏌ヨ璁惧淇℃伅锛堝甫涔愯閿佺増鏈彿锛�
+        EquipmentManagement equipment = equipmentManagementMapper.selectById(equipmentId);
+        if (equipment == null) {
+            throw new RuntimeException("璁惧涓嶅瓨鍦�");
+        }
+
         if (Objects.isNull(equipmentUsageRecordDto.getId())) {
+            // 妫�鏌ュ簱瀛樻槸鍚﹀厖瓒�
+            if (equipment.getQuantity() < newUsageQuantity) {
+                throw new RuntimeException("搴撳瓨涓嶈冻锛屽綋鍓嶅簱瀛橈細" + equipment.getQuantity());
+            }
+
+            // 鎵e噺搴撳瓨
+            equipment.setQuantity(equipment.getQuantity() - newUsageQuantity);
+            equipmentManagementMapper.updateById(equipment);
+
+            // 鍒涘缓棰嗙敤璁板綍
             return equipmentUsageRecordMapper.insert(equipmentUsageRecord);
         } else {
+            // 1. 鏌ヨ鍘熼鐢ㄨ褰�
+            EquipmentUsageRecord originalRecord = equipmentUsageRecordMapper.selectById(equipmentUsageRecordDto.getId());
+            if (originalRecord == null) {
+                throw new RuntimeException("棰嗙敤璁板綍涓嶅瓨鍦�");
+            }
+
+            // 2. 璁$畻搴撳瓨鍙樺寲閲忥紙鏂版暟閲� - 鏃ф暟閲忥級
+            int quantityDelta = newUsageQuantity - originalRecord.getUsageQuantity();
+
+            if (quantityDelta != 0) {
+                // 3. 妫�鏌ヨ皟鏁村悗搴撳瓨鏄惁鍏呰冻锛堣�冭檻澧炲姞鍜屽噺灏戜袱绉嶆儏鍐碉級
+                int newInventory = equipment.getQuantity() - quantityDelta;
+                if (newInventory < 0) {
+                    throw new RuntimeException("搴撳瓨涓嶈冻锛岃皟鏁村悗搴撳瓨灏嗕负锛�" + newInventory);
+                }
+
+                // 4. 璋冩暣搴撳瓨
+                equipment.setQuantity(newInventory);
+                if (equipmentManagementMapper.updateById(equipment) == 0) {
+                    throw new RuntimeException("搴撳瓨鏇存柊澶辫触锛屽彲鑳藉凡琚叾浠栨搷浣滀慨鏀�");
+                }
+            }
+
+            // 5. 鏇存柊棰嗙敤璁板綍
             return equipmentUsageRecordMapper.updateById(equipmentUsageRecord);
         }
     }

--
Gitblit v1.9.3