Browse Source

输入模块:优化根据芯片ID验证是否该基站是否合法。

zhuoning 2 years ago
parent
commit
bbe04f54fd

+ 2 - 0
huimv-eartag2-platform/huimv-eartag2-input/src/main/java/com/huimv/eartag2/service/ICacheService.java

@@ -8,4 +8,6 @@ public interface ICacheService {
 
 
     //
     //
     boolean checkEffectiveDeviceSet(String idCode);
     boolean checkEffectiveDeviceSet(String idCode);
+
+    long putEffectiveDeviceSet(String idCode);
 }
 }

+ 6 - 0
huimv-eartag2-platform/huimv-eartag2-input/src/main/java/com/huimv/eartag2/service/impl/CacheServiceImpl.java

@@ -38,4 +38,10 @@ public class CacheServiceImpl implements ICacheService {
         String setKey = BizConst.SET_ALL_DEVICE_PREFIX;
         String setKey = BizConst.SET_ALL_DEVICE_PREFIX;
         return redisTemplate.opsForSet().isMember(setKey,idCode);
         return redisTemplate.opsForSet().isMember(setKey,idCode);
     }
     }
+
+    @Override
+    public long putEffectiveDeviceSet(String idCode) {
+        String setKey = BizConst.SET_ALL_DEVICE_PREFIX;
+        return redisTemplate.opsForSet().add(setKey,idCode);
+    }
 }
 }

+ 16 - 9
huimv-eartag2-platform/huimv-eartag2-input/src/main/java/com/huimv/eartag2/service/impl/DataServiceImpl.java

@@ -2,14 +2,8 @@ package com.huimv.eartag2.service.impl;
 
 
 import com.alibaba.fastjson.JSONObject;
 import com.alibaba.fastjson.JSONObject;
 
 
-import com.huimv.eartag2.common.dao.entity.EartagDataEntity;
-import com.huimv.eartag2.common.dao.entity.EartagEnvEntity;
-import com.huimv.eartag2.common.dao.entity.EartagHeartbeatEntity;
-import com.huimv.eartag2.common.dao.entity.EartagRawEntity;
-import com.huimv.eartag2.common.dao.repo.EartagDataRepo;
-import com.huimv.eartag2.common.dao.repo.EartagEnvRepo;
-import com.huimv.eartag2.common.dao.repo.EartagHeartbeatRepo;
-import com.huimv.eartag2.common.dao.repo.EartagRawRepo;
+import com.huimv.eartag2.common.dao.entity.*;
+import com.huimv.eartag2.common.dao.repo.*;
 import com.huimv.eartag2.common.mq.Const;
 import com.huimv.eartag2.common.mq.Const;
 import com.huimv.eartag2.common.utils.BizConst;
 import com.huimv.eartag2.common.utils.BizConst;
 import com.huimv.eartag2.common.utils.FileUtil;
 import com.huimv.eartag2.common.utils.FileUtil;
@@ -72,6 +66,9 @@ public class DataServiceImpl implements IDataService {
     private RegexUtil regexUtil;
     private RegexUtil regexUtil;
     @Autowired
     @Autowired
     private ICacheService cacheService;
     private ICacheService cacheService;
+    @Autowired
+    private EartagDeviceRegisterRepo eartagDeviceRegisterRepo;
+
 
 
     //处理接收数据
     //处理接收数据
     @Override
     @Override
@@ -564,7 +561,17 @@ public class DataServiceImpl implements IDataService {
     @Override
     @Override
     public boolean isEffectiveDevice(String idCode) {
     public boolean isEffectiveDevice(String idCode) {
         //{检查有效设备集合}
         //{检查有效设备集合}
-        return cacheService.checkEffectiveDeviceSet(idCode);
+        if(cacheService.checkEffectiveDeviceSet(idCode)){
+            return true;
+        }else{
+            EartagDeviceRegisterEntity eartagDeviceRegisterEntity = eartagDeviceRegisterRepo.getByChipId(idCode);
+            if(eartagDeviceRegisterEntity == null){
+                return false;
+            }else{
+                cacheService.putEffectiveDeviceSet(idCode);
+                return true;
+            }
+        }
     }
     }
 
 
     /**
     /**