物模型code—>name缓存修改
This commit is contained in:
parent
e521234d94
commit
116cd62e59
@ -469,7 +469,7 @@ public class SysIotModelServiceImpl implements SysIotModelService {
|
|||||||
addModelFieldCache(highCreateList.get(i));
|
addModelFieldCache(highCreateList.get(i));
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
for (SysIotModelField item : calCreateList){
|
for (SysIotModelField item : calCreateList) {
|
||||||
createTdStableOrColumn(item);
|
createTdStableOrColumn(item);
|
||||||
addModelFieldCache(item);
|
addModelFieldCache(item);
|
||||||
}
|
}
|
||||||
@ -582,7 +582,7 @@ public class SysIotModelServiceImpl implements SysIotModelService {
|
|||||||
if (sysIotModelField.getAttributeType() == 199) {
|
if (sysIotModelField.getAttributeType() == 199) {
|
||||||
Long iotModelId = sysIotModelField.getIotModelId();
|
Long iotModelId = sysIotModelField.getIotModelId();
|
||||||
String modelCode = dataService.iotModelMap.get(iotModelId.toString());
|
String modelCode = dataService.iotModelMap.get(iotModelId.toString());
|
||||||
tdEngineService.deleteStable("c_" + modelCode +"_"+ sysIotModelField.getAttributeCode());
|
tdEngineService.deleteStable("c_" + modelCode + "_" + sysIotModelField.getAttributeCode());
|
||||||
} else {
|
} else {
|
||||||
String stableName = null;
|
String stableName = null;
|
||||||
SysIotModel sysIotModel = sysIotModelMapper.selectById(sysIotModelField.getIotModelId());
|
SysIotModel sysIotModel = sysIotModelMapper.selectById(sysIotModelField.getIotModelId());
|
||||||
@ -611,6 +611,15 @@ public class SysIotModelServiceImpl implements SysIotModelService {
|
|||||||
private void addModelFieldCache(SysIotModelField sysIotModelField) {
|
private void addModelFieldCache(SysIotModelField sysIotModelField) {
|
||||||
//获取物模型编码
|
//获取物模型编码
|
||||||
String modelCode = dataService.iotModelMap.get(sysIotModelField.getIotModelId().toString());
|
String modelCode = dataService.iotModelMap.get(sysIotModelField.getIotModelId().toString());
|
||||||
|
Map<String, String> fieldCodeNameMap = dataService.fieldCodeNameMap.get(modelCode);
|
||||||
|
if (fieldCodeNameMap == null) {
|
||||||
|
Map<String, String> fieldCodeName = new HashMap<>();
|
||||||
|
fieldCodeName.put(sysIotModelField.getAttributeCode(),sysIotModelField.getAttributeName());
|
||||||
|
dataService.fieldCodeNameMap.put(modelCode,fieldCodeName);
|
||||||
|
}
|
||||||
|
else {
|
||||||
|
fieldCodeNameMap.put(sysIotModelField.getAttributeCode(), sysIotModelField.getAttributeName());
|
||||||
|
}
|
||||||
if (sysIotModelField.getAttributeType() == 199) {
|
if (sysIotModelField.getAttributeType() == 199) {
|
||||||
Map<String, String> map = dataService.calculateIotFieldMap.get(modelCode);
|
Map<String, String> map = dataService.calculateIotFieldMap.get(modelCode);
|
||||||
if (map == null) {
|
if (map == null) {
|
||||||
@ -657,10 +666,12 @@ public class SysIotModelServiceImpl implements SysIotModelService {
|
|||||||
private void deleteModelFieldCache(SysIotModelField sysIotModelField) {
|
private void deleteModelFieldCache(SysIotModelField sysIotModelField) {
|
||||||
//获取物模型编码
|
//获取物模型编码
|
||||||
String modelCode = dataService.iotModelMap.get(sysIotModelField.getIotModelId().toString());
|
String modelCode = dataService.iotModelMap.get(sysIotModelField.getIotModelId().toString());
|
||||||
if (sysIotModelField.getAttributeType() == 199){
|
Map<String, String> fieldCodeName = dataService.fieldCodeNameMap.get(modelCode);
|
||||||
|
fieldCodeName.remove(sysIotModelField.getAttributeCode());
|
||||||
|
if (sysIotModelField.getAttributeType() == 199) {
|
||||||
Map<String, String> map = dataService.calculateIotFieldMap.get(modelCode);
|
Map<String, String> map = dataService.calculateIotFieldMap.get(modelCode);
|
||||||
map.remove(sysIotModelField.getAttributeCode());
|
map.remove(sysIotModelField.getAttributeCode());
|
||||||
}else {
|
} else {
|
||||||
if (sysIotModelField.getHighSpeed() == 0) {
|
if (sysIotModelField.getHighSpeed() == 0) {
|
||||||
Map<String, Object> map = dataService.lowIotFieldMap.get(modelCode);
|
Map<String, Object> map = dataService.lowIotFieldMap.get(modelCode);
|
||||||
map.remove(sysIotModelField.getAttributeCode());
|
map.remove(sysIotModelField.getAttributeCode());
|
||||||
|
Loading…
Reference in New Issue
Block a user