药品缓存接口更改

src/main/java/com/diagbot/enums/RedisEnum.java

@@ -11,7 +11,7 @@ import lombok.Setter;
 
 public enum RedisEnum implements KeyedNamed {
 
-    drugType(1, "药品分类_");
+    drugType(1, "drugType:");
 
     @Setter
     private int key;

src/main/java/com/diagbot/facade/CacheFacade.java

@@ -17,6 +17,8 @@ public class CacheFacade {
 
     @Autowired
     RedisUtil redisUtil;
+    @Autowired
+    NeoFacade neoFacade;
 
     /**
      * 清除缓存信息
@@ -51,5 +53,11 @@ public class CacheFacade {
      */
     public void clearLoadCache() {
         redisUtil.deleteByPrex(RedisEnum.drugType.getName());
+        redisUtil.deleteByPrex("药品分类_");
+        neoFacade.getDrugCache();
+    }
+
+    public void clearLoadCache(String str) {
+        redisUtil.deleteByPrex(str);
     }
 }

src/main/java/com/diagbot/facade/NeoFacade.java

@@ -1,15 +1,26 @@
 package com.diagbot.facade;
 
 import com.alibaba.fastjson.JSONArray;
-import com.diagbot.biz.push.entity.Item;
 import com.diagbot.biz.push.entity.Lis;
 import com.diagbot.client.ChiefPresentSimilarityServiceClient;
 import com.diagbot.client.StandConvertServiceClient;
-import com.diagbot.dto.*;
+import com.diagbot.dto.BillNeoDTO;
+import com.diagbot.dto.CriticalNeoDTO;
+import com.diagbot.dto.HighRiskNeoDTO;
+import com.diagbot.dto.NeoPushDTO;
+import com.diagbot.dto.NodeNeoDTO;
+import com.diagbot.dto.OtherTipNeoDTO;
+import com.diagbot.dto.OtherTipPacsNeoDTO;
+import com.diagbot.dto.OtherTipTransfusionNeoDTO;
+import com.diagbot.dto.PushBaseDTO;
+import com.diagbot.dto.StandConvertCrfBatchDTO;
+import com.diagbot.dto.StandConvertCrfDTO;
+import com.diagbot.dto.WordCrfDTO;
 import com.diagbot.entity.node.LisRemind;
 import com.diagbot.entity.node.Medicine;
 import com.diagbot.entity.node.Symptom;
 import com.diagbot.entity.node.YiBaoDiseaseName;
+import com.diagbot.enums.RedisEnum;
 import com.diagbot.enums.StandConvertEnum;
 import com.diagbot.exception.CommonErrorCode;
 import com.diagbot.exception.CommonException;
@@ -17,7 +28,12 @@ import com.diagbot.repository.*;
 import com.diagbot.util.ListUtil;
 import com.diagbot.util.RedisUtil;
 import com.diagbot.util.StringUtil;
-import com.diagbot.vo.*;
+import com.diagbot.vo.BillNeoVO;
+import com.diagbot.vo.CriticalNeoVO;
+import com.diagbot.vo.Drug;
+import com.diagbot.vo.NeoPushVO;
+import com.diagbot.vo.StandConvert;
+import com.diagbot.vo.StandConvertCrfVO;
 import com.diagbot.vo.neoPushEntity.ChiefPushVo;
 import com.diagbot.vo.neoPushEntity.Diag;
 import com.diagbot.vo.neoPushEntity.PresentPushVo;
@@ -33,7 +49,14 @@ import org.springframework.stereotype.Component;
 
 import java.math.BigDecimal;
 import java.text.DecimalFormat;
-import java.util.*;
+import java.util.ArrayList;
+import java.util.Collection;
+import java.util.Collections;
+import java.util.HashMap;
+import java.util.Iterator;
+import java.util.LinkedHashMap;
+import java.util.List;
+import java.util.Map;
 import java.util.function.Function;
 import java.util.stream.Collectors;
 import java.util.stream.Stream;
@@ -126,7 +149,7 @@ public class NeoFacade {
 
         // 加载药品缓存
         for (String key : res.keySet()) {
-            redisUtil.updateValueByType("药品分类_" + key, res.get(key));
+            redisUtil.updateValueByType(RedisEnum.drugType.getName() + key, res.get(key));
         }
         return res;
     }

src/main/java/com/diagbot/facade/TestFacade.java

@@ -7,6 +7,7 @@ import com.diagbot.client.StandConvertServiceClient;
 import com.diagbot.dto.IndicationDTO;
 import com.diagbot.dto.StandConvertCrfBatchDTO;
 import com.diagbot.dto.StandConvertCrfDTO;
+import com.diagbot.enums.RedisEnum;
 import com.diagbot.exception.CommonErrorCode;
 import com.diagbot.exception.CommonException;
 import com.diagbot.util.BeanUtil;
@@ -57,6 +58,8 @@ public class TestFacade {
     StandConvertServiceClient standConvertServiceClient;
     @Autowired
     RedisUtil redisUtil;
+    @Autowired
+    CacheFacade cacheFacade;
 
     /**
      * 开单项数据测试
@@ -182,7 +185,7 @@ public class TestFacade {
                             pastStr.append("有“").append(bean.getNeoName()).append("”过敏。");
                             indicationPushVO.setPasts(pastStr.toString());
                         } else if ("药品类别".equals(bean.getDrugType())) {
-                            List<String> drugList = (List<String>)redisUtil.get("药品分类_" + bean.getNeoName());
+                            List<String> drugList = (List<String>)redisUtil.get(RedisEnum.drugType.getName() + bean.getNeoName());
                             if (ListUtil.isNotEmpty(drugList)) {
                                 if (testLineVO.isGetOne()) {
                                     pastStr.append("有“").append(drugList.get(getRandomNum(drugList.size()))).append("”过敏。");
@@ -1005,10 +1008,10 @@ public class TestFacade {
                 }
             }
             map.put("总条数", indicationPushVOList.size() + "条");
+            map.put("出错条数", errMsg.size() + "条");
             if (ListUtil.isNotEmpty(errMsg)) {
                 map.put("出错信息", errMsg);
             }
-            map.put("出错条数", errMsg.size() + "条");
             Long t2 = System.currentTimeMillis();
             map.put("执行时间", (t2 - start) / 1000.0 + "秒");
         } catch (Exception e) {