部件字典管理接口和部件po

energy-manage-common/src/main/java/com/energy/manage/common/constant/redis/ManagerRedisKeyConstant.java

@@ -29,6 +29,9 @@ public class ManagerRedisKeyConstant {
     // 属性
     public static final String IDGENERATOR_UDPC_KEY = "energy:Idgenerator:unit:{id}";
 
+    //品牌对应型号，数据集合
+    public static final String IDGENERATOR_UDPB_KEY = "energy:Idgenerator:unit:brandlist:{id}";
+
     private static final String PLACE_HOLDER = "{id}";
 
 

energy-manage-service/src/main/java/com/energy/manage/service/service/units/impl/UnitDictConstantsServiceImpl.java

@@ -248,6 +248,9 @@ public class UnitDictConstantsServiceImpl extends BaseServiceImpl<UnitDictConsta
         UnitDictBrandModelPO po = new UnitDictBrandModelPO();
         BeanUtil.copyProperties(unitDictBrandModelDto, po);
         po.setCreateTime(new Date());
+
+        // redis删除
+        delBrandRedisKey(unitDictBrandModelDto.getManufacture());
         return unitDictBrandModelMapper.insertUseGeneratedKeys(po) > 0;
     }
 
@@ -260,6 +263,9 @@ public class UnitDictConstantsServiceImpl extends BaseServiceImpl<UnitDictConsta
         Example queryExample = new Example(UnitDictBrandModelPO.class);
         Example.Criteria criteria = queryExample.createCriteria();
         criteria.andEqualTo("id", unitDictBrandModelUpdateDto.getId());
+
+        // redis删除
+        delBrandRedisKey(unitDictBrandModelUpdateDto.getManufacture());
         return unitDictBrandModelMapper.updateByExampleSelective(po, queryExample) > 0;
     }
 
@@ -289,5 +295,14 @@ public class UnitDictConstantsServiceImpl extends BaseServiceImpl<UnitDictConsta
         return count > 0 ? true : false;
     }
 
+    /**
+     * 删除品牌对应型号
+     * @param brandKey
+     * @return
+     */
+    private void delBrandRedisKey(String brandKey){
+        String brandlistKey = ManagerRedisKeyConstant.build(ManagerRedisKeyConstant.IDGENERATOR_UDPB_KEY, brandKey);
+        cacheService.delete(brandlistKey);
+    }
 
 }

energy-manage-service/src/main/java/com/energy/manage/service/service/units/impl/UnitServiceImpl.java

@@ -3,6 +3,8 @@ package com.energy.manage.service.service.units.impl;
 
 import cn.hutool.core.bean.BeanUtil;
 import cn.hutool.core.util.ObjectUtil;
+import com.alibaba.fastjson.JSON;
+import com.alibaba.fastjson.JSONArray;
 import com.energy.manage.common.base.BaseServiceImpl;
 import com.energy.manage.common.base.Page;
 import com.energy.manage.common.constant.redis.ManagerRedisKeyConstant;
@@ -81,7 +83,17 @@ public class UnitServiceImpl implements UnitService {
 
     @Override
     public List<String> getBrandModelNameOrModelNumber(UnitDictBrandModelDto unitDictBrandModelDto) {
-        return unitDictConstantsService.getUnitDictBrandModelList(unitDictBrandModelDto);
+
+        String brandlistKey = ManagerRedisKeyConstant.build(ManagerRedisKeyConstant.IDGENERATOR_UDPB_KEY, unitDictBrandModelDto.getManufacture());
+        String val = cacheService.get(brandlistKey);
+        if(StringUtils.isEmpty(val)){
+            List<String> valueString = unitDictConstantsService.getUnitDictBrandModelList(unitDictBrandModelDto);
+            log.info("品牌对应型号 ===> " + JSON.toJSONString(valueString));
+            cacheService.add(brandlistKey, JSON.toJSONString(valueString));
+            return valueString;
+        }
+        List<String> modelList = JSONArray.parseArray(val,String.class);
+        return modelList;
     }
 
     @Override