dendi-wang/thingsboard
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fix KeyDictionaryDao.getOrSaveKeyId returning zero

Browse Source
This commit is contained in:
ViacheslavKlimov 2024-08-06 19:24:34 +03:00
parent 16b313b336
commit 73214e9afe
1 changed files with 8 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
dao/src/main/java/org/thingsboard/server/dao/sqlts/dictionary/JpaKeyDictionaryDao.java
View File

@ -15,11 +15,13 @@
*/ */
package org.thingsboard.server.dao.sqlts.dictionary; package org.thingsboard.server.dao.sqlts.dictionary;
import lombok.RequiredArgsConstructor;
import lombok.extern.slf4j.Slf4j; import lombok.extern.slf4j.Slf4j;
import org.hibernate.exception.ConstraintViolationException; import org.hibernate.exception.ConstraintViolationException;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.dao.DataIntegrityViolationException; import org.springframework.dao.DataIntegrityViolationException;
import org.springframework.stereotype.Component; import org.springframework.stereotype.Component;
import org.springframework.transaction.annotation.Propagation;
import org.springframework.transaction.annotation.Transactional;
import org.thingsboard.server.dao.dictionary.KeyDictionaryDao; import org.thingsboard.server.dao.dictionary.KeyDictionaryDao;
import org.thingsboard.server.dao.model.sqlts.dictionary.KeyDictionaryCompositeKey; import org.thingsboard.server.dao.model.sqlts.dictionary.KeyDictionaryCompositeKey;
import org.thingsboard.server.dao.model.sqlts.dictionary.KeyDictionaryEntry; import org.thingsboard.server.dao.model.sqlts.dictionary.KeyDictionaryEntry;
@ -34,14 +36,15 @@ import java.util.concurrent.locks.ReentrantLock;
@Component @Component
@Slf4j @Slf4j
@SqlDao @SqlDao
@RequiredArgsConstructor
public class JpaKeyDictionaryDao extends JpaAbstractDaoListeningExecutorService implements KeyDictionaryDao { public class JpaKeyDictionaryDao extends JpaAbstractDaoListeningExecutorService implements KeyDictionaryDao {
private final KeyDictionaryRepository keyDictionaryRepository;
private final ConcurrentMap<String, Integer> keyDictionaryMap = new ConcurrentHashMap<>(); private final ConcurrentMap<String, Integer> keyDictionaryMap = new ConcurrentHashMap<>();
protected static final ReentrantLock creationLock = new ReentrantLock(); private static final ReentrantLock creationLock = new ReentrantLock();
@Autowired
private KeyDictionaryRepository keyDictionaryRepository;
@Transactional(propagation = Propagation.NOT_SUPPORTED)
@Override @Override
public Integer getOrSaveKeyId(String strKey) { public Integer getOrSaveKeyId(String strKey) {
Integer keyId = keyDictionaryMap.get(strKey); Integer keyId = keyDictionaryMap.get(strKey);