From 47a751cb301d05276ae5d75145d57b2d090fe4e1 Mon Sep 17 00:00:00 2001
From: kongzy <kongzy>
Date: 星期一, 01 七月 2024 10:58:35 +0800
Subject: [PATCH] change
---
src/main/java/com/nanometer/smartlab/service/BaseMetaServiceImpl.java | 101 +++++++++++++++++++-------------------------------
1 files changed, 38 insertions(+), 63 deletions(-)
diff --git a/src/main/java/com/nanometer/smartlab/service/BaseMetaServiceImpl.java b/src/main/java/com/nanometer/smartlab/service/BaseMetaServiceImpl.java
index 269f52b..c4f353a 100644
--- a/src/main/java/com/nanometer/smartlab/service/BaseMetaServiceImpl.java
+++ b/src/main/java/com/nanometer/smartlab/service/BaseMetaServiceImpl.java
@@ -44,7 +44,7 @@
// key为分组id，value为数据列表
private Map<String, List<BaseMeta>> baseMetaListMap;
// key为数据id，value为数据
- private Map<String, BaseMeta> baseMetaMap;
+ private Map<Long, BaseMeta> baseMetaMap;
public synchronized void loadData() {
try {
@@ -54,19 +54,19 @@
baseMetaGroupList = new ArrayList<BaseMetaGroup>();
} else {
for (BaseMetaGroup baseMetaGroup : baseMetaGroupList) {
- baseMetaGroupMap.put(baseMetaGroup.getId(), baseMetaGroup);
+ baseMetaGroupMap.put(baseMetaGroup.getCode(), baseMetaGroup);
}
}
- List<BaseMeta> baseMetaList = this.getBaseMetaList(null, null, null, null);
+ List<BaseMeta> baseMetaList = this.getBaseMetaList((String) null, null, null, null);
baseMetaListMap = new HashMap<String, List<BaseMeta>>();
- baseMetaMap = new HashMap<String, BaseMeta>();
+ baseMetaMap = new HashMap<Long, BaseMeta>();
if (baseMetaList != null) {
String key = null;
for (BaseMeta baseMeta : baseMetaList) {
if (!baseMetaListMap.containsKey(baseMeta.getGroupId())
|| baseMetaListMap.get(baseMeta.getGroupId()) == null) {
- baseMetaListMap.put(baseMeta.getGroupId(), new ArrayList<BaseMeta>());
+ baseMetaListMap.put(baseMeta.getGroupCode(), new ArrayList<BaseMeta>());
}
baseMetaListMap.get(baseMeta.getGroupId()).add(baseMeta);
@@ -79,10 +79,10 @@
}
@Transactional(propagation = Propagation.REQUIRED)
- public int getBaseMetaTotalCount(String groupId, String keyword) {
+ public int getBaseMetaTotalCount(String groupCode, String keyword) {
try {
Map<String, Object> params = new HashMap<String, Object>();
- params.put("groupId", groupId);
+ params.put("groupCode", groupCode);
if (StringUtils.isNotBlank(keyword)) {
params.put("keyword", "%" + keyword + "%");
}
@@ -94,12 +94,12 @@
}
@Transactional(propagation = Propagation.REQUIRED)
- public boolean isBaseMetaExist(String groupId, String metaKey, String editId) {
+ public boolean isBaseMetaExist(String groupCode, String metaKey, Long editId) {
try {
Map<String, Object> params = new HashMap<String, Object>();
- params.put("groupId", groupId);
+ params.put("groupCode", groupCode);
params.put("metaKey", metaKey);
- if (StringUtils.isNotBlank(editId)) {
+ if (editId!=null) {
params.put("editId", editId);
}
int count = this.baseMetaDao.getBaseMetaTotalCount(params);
@@ -111,10 +111,10 @@
}
@Transactional(propagation = Propagation.REQUIRED)
- public List<BaseMeta> getBaseMetaList(String groupId, String keyword, Integer first, Integer pageSize) {
+ public List<BaseMeta> getBaseMetaList(String groupCode, String keyword, Integer first, Integer pageSize) {
try {
Map<String, Object> params = new HashMap<String, Object>();
- params.put("groupId", groupId);
+ params.put("groupCode", groupCode);
if (StringUtils.isNotBlank(keyword)) {
params.put("keyword", "%" + keyword + "%");
}
@@ -128,7 +128,7 @@
}
@Transactional(propagation = Propagation.REQUIRED)
- public BaseMeta getBaseMeta(String id) {
+ public BaseMeta getBaseMeta(Long id) {
try {
return this.baseMetaDao.getBaseMeta(id);
} catch (DataAccessException e) {
@@ -143,12 +143,8 @@
if (baseMeta == null) {
return null;
}
-
- if (baseMeta.getId() == null) {
- baseMeta.setId(IDUtils.uuid());
- }
this.baseMetaDao.insertBaseMeta(baseMeta);
- this.loadData();
+ // this.loadData();
return baseMeta;
} catch (DuplicateKeyException ex) {
logger.warn(ex.getMessage(), ex);
@@ -188,7 +184,7 @@
}
@Transactional(propagation = Propagation.REQUIRED)
- public boolean deleteBaseMeta(List<String> ids) {
+ public boolean deleteBaseMeta(List<Long> ids) {
try {
if (ids == null || ids.isEmpty()) {
return false;
@@ -211,70 +207,49 @@
public List<BaseMetaGroup> getBaseMetaGroupList() {
if (baseMetaGroupList == null) {
- this.loadData();
+ baseMetaGroupList = this.baseMetaGroupService.getBaseMetaGroupList();
}
-
return baseMetaGroupList;
}
- public String getBaseMetaGroupName(String baseMetaGroupId) {
- if (StringUtils.isBlank(baseMetaGroupId)) {
+ public String getBaseMetaGroupName(String baseMetaGroupCode) {
+ if (StringUtils.isBlank(baseMetaGroupCode)) {
return "";
}
-
- if (baseMetaGroupMap == null) {
- this.loadData();
+ BaseMetaGroup baseMetaGroup= this.baseMetaGroupService.getBaseMetaGroupByCode(baseMetaGroupCode);
+ if(baseMetaGroup!=null){
+ return baseMetaGroup.getName();
}
-
- if (baseMetaGroupMap.containsKey(baseMetaGroupId)
- && baseMetaGroupMap.get(baseMetaGroupId) != null) {
- return baseMetaGroupMap.get(baseMetaGroupId).getName();
- }
-
return "";
}
- public List<BaseMeta> getBaseMetaList(String baseMetaGroupId) {
- if (StringUtils.isBlank(baseMetaGroupId)) {
+ public List<BaseMeta> getBaseMetaList(String baseMetaGroupCode) {
+ if (StringUtils.isBlank(baseMetaGroupCode)) {
return null;
}
-
- if (baseMetaListMap == null) {
- this.loadData();
- }
-
- return baseMetaListMap.get(baseMetaGroupId);
+ Map<String,Object> params=new HashMap();
+ params.put("groupCode",baseMetaGroupCode);
+ return baseMetaDao.getBaseMetaList(params);
}
- public String getBaseMetaValue(String id) {
- if (StringUtils.isBlank(id)) {
+ public String getBaseMetaValue(Long id) {
+ if (id==null) {
return "";
}
-
- if (baseMetaMap == null) {
- this.loadData();
+ BaseMeta baseMeta=this.baseMetaDao.getBaseMeta(id);
+ if(baseMeta!=null){
+ return baseMeta.getMetaValue();
}
-
- if (baseMetaMap.containsKey(id)
- && baseMetaMap.get(id) != null) {
- return baseMetaMap.get(id).getMetaValue();
- }
-
return "";
}
- public String getBaseMetaKey(String id) {
- if (StringUtils.isBlank(id)) {
+ public String getBaseMetaKey(Long id) {
+ if (id==null) {
return "";
}
- if (baseMetaMap == null) {
- this.loadData();
+ BaseMeta baseMeta=this.baseMetaDao.getBaseMeta(id);
+ if(baseMeta!=null){
+ return baseMeta.getMetaKey();
}
-
- if (baseMetaMap.containsKey(id)
- && baseMetaMap.get(id) != null) {
- return baseMetaMap.get(id).getMetaKey();
- }
-
return "";
}
@@ -284,7 +259,7 @@
}
@Override
- public BaseMeta getBaseMeta(String groupId, String key,String value) {
- return baseMetaDao.selectBaseMeta(groupId,key,value);
+ public BaseMeta getBaseMeta(String groupCode, String key,String value) {
+ return baseMetaDao.selectBaseMeta(groupCode,key,value);
}
}
--
Gitblit v1.9.2