From e05c484c367284ef421f7bcfaf732c007cec393b Mon Sep 17 00:00:00 2001
From: siyang <2337720667@qq.com>
Date: Sun, 29 Sep 2024 11:27:43 +0800
Subject: [PATCH] fix NPE

---
 .../impl/CarbonEnergyDictRelationServiceImpl.java | 15 +++++++++------
 1 file changed, 9 insertions(+), 6 deletions(-)

diff --git a/modules/report-analysis/src/main/java/com/thing/carbon/config/service/impl/CarbonEnergyDictRelationServiceImpl.java b/modules/report-analysis/src/main/java/com/thing/carbon/config/service/impl/CarbonEnergyDictRelationServiceImpl.java
index e4e8348..dca6505 100644
--- a/modules/report-analysis/src/main/java/com/thing/carbon/config/service/impl/CarbonEnergyDictRelationServiceImpl.java
+++ b/modules/report-analysis/src/main/java/com/thing/carbon/config/service/impl/CarbonEnergyDictRelationServiceImpl.java
@@ -1,7 +1,6 @@
 package com.thing.carbon.config.service.impl;
 
-import cn.hutool.core.map.MapUtil;
-import com.mybatisflex.core.keygen.impl.SnowFlakeIDKeyGenerator;
+
 import com.mybatisflex.core.paginate.Page;
 import com.mybatisflex.core.query.QueryWrapper;
 import com.thing.carbon.config.dto.CarbonEnergyDictRelationDTO;
@@ -21,12 +20,13 @@ import com.thing.sys.security.domain.SecurityUser;
 import com.thing.sys.security.domain.UserDetail;
 import com.thing.thing.context.service.ThingManageContextService;
 import com.thing.thing.dict.dto.IotThingDictDTO;
-import com.thing.thing.dictRelation.dto.IotThingDictRelationDTO;
 import com.thing.thing.dictRelation.param.IotThingDictRelationParamDTO;
-import com.thing.thing.entity.dto.IotThingEntityDTO;
 import com.thing.thing.entity.dto.IotThingEntityInfoDTO;
+
 import lombok.RequiredArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
+
+import org.apache.commons.collections4.MapUtils;
 import org.apache.commons.lang3.ObjectUtils;
 import org.apache.commons.lang3.StringUtils;
 import org.springframework.stereotype.Service;
@@ -53,8 +53,8 @@ public class CarbonEnergyDictRelationServiceImpl extends BaseServiceImpl<CarbonE
     @Override
     public QueryWrapper getWrapper(Map<String, Object> params) {
         QueryWrapper wrapper = new QueryWrapper();
-        Long energyVarietyId = MapUtil.getLong(params, "energyVarietyId");
-        String attrType = MapUtil.getStr(params, "attrType");
+        Long energyVarietyId = MapUtils.getLong(params, "energyVarietyId");
+        String attrType = MapUtils.getString(params, "attrType");
         wrapper.eq( CarbonEnergyDictRelationEntity::getEnergyVarietyId, energyVarietyId, ObjectUtils.isNotEmpty(energyVarietyId))
                 .eq(CarbonEnergyDictRelationEntity::getAttrType, attrType,StringUtils.isNotBlank(attrType));
         return wrapper;
@@ -192,6 +192,9 @@ public class CarbonEnergyDictRelationServiceImpl extends BaseServiceImpl<CarbonE
         for (CarbonEnergyDictRelationDTO energyDictRelation : list) {
             Long energyVarietyId = energyDictRelation.getEnergyVarietyId();
             CarbonEnergyVarietyEntity energyVariety = energyVarietyMap.get(energyVarietyId);
+            if (Objects.isNull(energyVariety)) {
+                continue;
+            }
             energyDictRelation.setEnergyVarietyName(energyVariety.getName());
             energyDictRelation.setEnergyVarietyCode(energyVariety.getCode());
         }