From fd7d8bd2c88cb51899901211a2fecdcea2690de2 Mon Sep 17 00:00:00 2001
From: huguanghan <ghhul@isoftstone.com>
Date: Fri, 1 Nov 2024 10:14:08 +0800
Subject: [PATCH] =?UTF-8?q?=E5=88=9D=E5=A7=8B=E5=8C=96=E8=AE=BE=E5=A4=87id?=
 =?UTF-8?q?=E7=89=A9=E6=A8=A1=E5=9E=8Bcode=E6=98=A0=E5=B0=84=E7=BC=93?=
 =?UTF-8?q?=E5=AD=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../service/impl/SysEquipmentServiceImpl.java       | 13 +++++++++++++
 1 file changed, 13 insertions(+)

diff --git a/das/src/main/java/com/das/modules/equipment/service/impl/SysEquipmentServiceImpl.java b/das/src/main/java/com/das/modules/equipment/service/impl/SysEquipmentServiceImpl.java
index 83aec758..4368905d 100644
--- a/das/src/main/java/com/das/modules/equipment/service/impl/SysEquipmentServiceImpl.java
+++ b/das/src/main/java/com/das/modules/equipment/service/impl/SysEquipmentServiceImpl.java
@@ -15,6 +15,7 @@ import com.das.common.utils.PageQuery;
 import com.das.common.utils.SequenceUtils;
 import com.das.modules.auth.domain.vo.SysUserVo;
 import com.das.modules.auth.mapper.SysOrgMapper;
+import com.das.modules.data.service.impl.DataServiceImpl;
 import com.das.modules.equipment.domain.dto.SysEquipmentDto;
 import com.das.modules.equipment.domain.excel.SysEquipmentExcel;
 import com.das.modules.equipment.domain.vo.SysEquipmentVo;
@@ -58,6 +59,9 @@ public class SysEquipmentServiceImpl implements SysEquipmentService {
     @Autowired
     private SysIotModelMapper sysIotModelMapper;
 
+    @Autowired
+    private DataServiceImpl dataService;
+
     @Override
     public SysEquipmentVo creatSysEquipment(SysEquipmentDto sysEquipmentDto) {
         //去除空格
@@ -76,6 +80,10 @@ public class SysEquipmentServiceImpl implements SysEquipmentService {
         sysEquipment.setUpdatedBy(sysUserVo.getAccount());
         sysEquipment.setRevision(1);
         sysEquipmentMapper.insert(sysEquipment);
+        //物模型不为空 增加设备物模型mapping缓存
+        if (sysEquipment.getIotModelId() != null){
+            dataService.deviceModelMap.put(sysEquipment.getId().toString(),dataService.iotModelMap.get(sysEquipment.getIotModelId().toString()));
+        }
         SysEquipmentVo sysEquipmentVo = new SysEquipmentVo();
         BeanCopyUtils.copy(sysEquipment, sysEquipmentVo);
         return sysEquipmentVo;
@@ -98,6 +106,9 @@ public class SysEquipmentServiceImpl implements SysEquipmentService {
         sysEquipment.setUpdatedTime(new Date());
         sysEquipment.setUpdatedBy(sysUserVo.getAccount());
         sysEquipmentMapper.updateById(sysEquipment);
+        if (oldSysEquipment.getIotModelId() == null && sysEquipment.getIotModelId() != null){
+            dataService.deviceModelMap.put(sysEquipment.getId().toString(),dataService.iotModelMap.get(sysEquipment.getIotModelId().toString()));
+        }
         SysEquipmentVo sysEquipmentVo = new SysEquipmentVo();
         BeanCopyUtils.copy(sysEquipment, sysEquipmentVo);
         return sysEquipmentVo;
@@ -110,6 +121,8 @@ public class SysEquipmentServiceImpl implements SysEquipmentService {
             throw new RuntimeException("该设备下有子设备，不能删除");
         }
         sysEquipmentMapper.deleteById(sysEquipmentDto.getId());
+        //删除缓存
+        dataService.deviceModelMap.remove(sysEquipmentDto.getId().toString());
     }
 
     @Override