解决导入消息推送问题

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

@@ -1579,7 +1579,7 @@ public class EquipmentSpecificSerivceImpl extends ServiceImpl<EquipmentSpecificM
     @Override
     public List<EquipmentSpecificVo> getEquipAndCarIotcodeByIotcode(String iotCode) {
         // TODO Auto-generated method stub
-        List<EquipmentSpecificVo> data = new ArrayList<EquipmentSpecificVo>();
+        List<EquipmentSpecificVo> data;
         if (redisUtils.hasKey("equipAndCarIotCodes")) {
             data = JSON.parseArray(redisUtils.get("equipAndCarIotCodes").toString(), EquipmentSpecificVo.class);
         } else {
@@ -1589,9 +1589,8 @@ public class EquipmentSpecificSerivceImpl extends ServiceImpl<EquipmentSpecificM
         if (ObjectUtils.isEmpty(data)) {
             return data;
         }
-
-        List<EquipmentSpecificVo> resultdata = data.stream().filter(a -> a.getIotCode().equals(iotCode)).collect(Collectors.toList());
-        return resultdata;
+        List<EquipmentSpecificVo> resultData = data.stream().filter(a -> a.getIotCode().equals(iotCode)).collect(Collectors.toList());
+        return resultData;
     }
 
     @Override

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

 package com.yeejoin.equipmanage.service.impl;
 
 import java.text.SimpleDateFormat;
-import java.util.ArrayList;
-import java.util.Date;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
+import java.util.*;
 import java.util.concurrent.atomic.AtomicReference;
 import java.util.stream.Collectors;
 
 import javax.annotation.Resource;
 
+import com.alibaba.fastjson.JSON;
+import com.alibaba.fastjson.JSONObject;
+import com.yeejoin.amos.boot.biz.common.utils.RedisUtils;
+import com.yeejoin.equipmanage.common.entity.vo.EquipmentSpecificVo;
+import com.yeejoin.equipmanage.common.enums.*;
 import org.apache.commons.lang3.StringUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.context.annotation.Lazy;
 import org.springframework.scheduling.annotation.Async;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
+import org.springframework.transaction.support.TransactionSynchronization;
+import org.springframework.transaction.support.TransactionSynchronizationManager;
 import org.typroject.tyboot.core.restful.exception.instance.BadRequest;
 
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
@@ -41,11 +44,6 @@ import com.yeejoin.equipmanage.common.entity.StockBillDetail;
 import com.yeejoin.equipmanage.common.entity.StockDetail;
 import com.yeejoin.equipmanage.common.entity.WarehouseStructure;
 import com.yeejoin.equipmanage.common.entity.vo.EquipmentDetailDownloadVO;
-import com.yeejoin.equipmanage.common.enums.BillContentEnum;
-import com.yeejoin.equipmanage.common.enums.EquipStatusEnum;
-import com.yeejoin.equipmanage.common.enums.JournalTypeEnum;
-import com.yeejoin.equipmanage.common.enums.NoticeEnum;
-import com.yeejoin.equipmanage.common.enums.StockBillTypeEnum;
 import com.yeejoin.equipmanage.common.utils.ExcelUtils;
 import com.yeejoin.equipmanage.common.utils.QRCodeUtil;
 import com.yeejoin.equipmanage.common.utils.StringUtil;
@@ -122,6 +120,9 @@ public class StockServiceImpl extends ServiceImpl<StockMapper, Stock> implements
     @Autowired
     private RelationRedisUtil relationRedisUtil;
 
+    @Autowired
+    private RedisUtils redisUtils;
+
     @Override
     @Transactional(rollbackFor = {Exception.class})
     public StockBill in(List<StockDetail> list, String type, AgencyUserModel agencyUserModel) {
@@ -456,6 +457,16 @@ public class StockServiceImpl extends ServiceImpl<StockMapper, Stock> implements
             this.equipmentSpecificIndexSave(equipmentDetail, equipmentSpecific);
         }
         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));
+            }
+        });
         return list;
     }