修改缓存

amos-boot-module/amos-boot-module-biz/amos-boot-module-equip-biz/src/main/java/com/yeejoin/equipmanage/service/impl/StockServiceImpl.java

@@ -508,16 +508,19 @@ public class StockServiceImpl extends ServiceImpl<StockMapper, Stock> implements
                 relationRedisUtil.delSysRedisKey(fireFightSysIdsBuffer.toString());
             }
 
-            TransactionSynchronizationManager.registerSynchronization(new TransactionSynchronization() {
-                @Override
-                public void afterCommit() {
-                    List<EquipmentSpecificVo> data = equipmentSpecificMapper.getEquipOrCarByIotCode(null);
-                    if (redisUtils.hasKey("equipAndCarIotCodes")) {
-                        redisUtils.del("equipAndCarIotCodes");
-                    }
-                    redisUtils.set("equipAndCarIotCodes", JSONObject.toJSONString(data));
-                }
-            });
+            if (redisUtils.hasKey("equipAndCarIotCodes")) {
+                redisUtils.del("equipAndCarIotCodes");
+            }
+//            TransactionSynchronizationManager.registerSynchronization(new TransactionSynchronization() {
+//                @Override
+//                public void afterCommit() {
+//                    List<EquipmentSpecificVo> data = equipmentSpecificMapper.getEquipOrCarByIotCode(null);
+//                    if (redisUtils.hasKey("equipAndCarIotCodes")) {
+//                        redisUtils.del("equipAndCarIotCodes");
+//                    }
+//                    redisUtils.set("equipAndCarIotCodes", JSONObject.toJSONString(data));
+//                }
+//            });
 
         } catch (Exception e) {
             //处理异常 返回 成功失败条数
@@ -528,7 +531,14 @@ public class StockServiceImpl extends ServiceImpl<StockMapper, Stock> implements
             return date;
         }
         String[] split = errBufferName.toString().split(",");
-        String date="上传成功:"+(equipmentDetailDownloadVOS.size()-(split!=null?split.length:0))+"条---上传失败:"+(split!=null?split.length:0)+"条(失败编号:"+errBufferName+"详情:"+erryy+")";
+        String date="";
+        if(split!=null&&split.length>0&&!"".equals(split[0])){
+             date="上传成功:"+(equipmentDetailDownloadVOS.size()-(split!=null?split.length:0))+"条---上传失败:"+(split!=null?split.length:0)+"条(失败编号:"+errBufferName+"详情:"+erryy+")";
+
+        }else{
+             date="上传成功:"+(equipmentDetailDownloadVOS.size())+"条---上传失败:"+"0条(失败编号:"+errBufferName+"详情:"+erryy+")";
+
+        }
         log.error(date);
         return date;
     }

amos-boot-module/amos-boot-module-biz/amos-boot-module-equip-biz/src/main/java/com/yeejoin/equipmanage/utils/RelationRedisUtil.java

@@ -44,7 +44,9 @@ public class RelationRedisUtil {
                  List<String> collect = list.stream().map(FireFightingSystemEntity::getSystemTypeCode).collect(Collectors.toList());
                  if (CollectionUtils.isNotEmpty(collect)) {
                      for (String key : collect) {
-                         redisUtil.del(key);
+                         if (key!=null&&redisUtil.hasKey(key)){
+                             redisUtil.del(key);
+                         }
                      }
                      return Boolean.TRUE;
                  }