|
@@ -2,14 +2,8 @@ package com.huimv.eartag2.service.impl;
|
|
|
|
|
|
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.utils.BizConst;
|
|
|
import com.huimv.eartag2.common.utils.FileUtil;
|
|
@@ -72,6 +66,9 @@ public class DataServiceImpl implements IDataService {
|
|
|
private RegexUtil regexUtil;
|
|
|
@Autowired
|
|
|
private ICacheService cacheService;
|
|
|
+ @Autowired
|
|
|
+ private EartagDeviceRegisterRepo eartagDeviceRegisterRepo;
|
|
|
+
|
|
|
|
|
|
//处理接收数据
|
|
|
@Override
|
|
@@ -564,7 +561,17 @@ public class DataServiceImpl implements IDataService {
|
|
|
@Override
|
|
|
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;
|
|
|
+ }
|
|
|
+ }
|
|
|
}
|
|
|
|
|
|
/**
|