|
@@ -571,23 +571,27 @@ public class InfoCodeUtil {
|
|
|
|
|
|
JSONArray result = new JSONArray();
|
|
|
if (typeToPathMap.containsKey(type)) {//project,building,floor,space,sy-gen,eq-gen,ec-gen,consumable,tool
|
|
|
+ log.info("======init====== TypeToInfosMap.synCache(): getAllInfoPoints(): InfoCode().queryAll(): InfoCodeUtil.getInfosForProperty() 1");
|
|
|
JSONArray infos = getSplitInfos(pjId, type);
|
|
|
CommonUtil.addField(infos, "classification", "0");//0表示没有分类
|
|
|
result.addAll(infos);
|
|
|
return result;
|
|
|
}
|
|
|
if (PhysicalObject.bussinessSpaceTypeMap.containsKey(type)) {
|
|
|
+ log.info("======init====== TypeToInfosMap.synCache(): getAllInfoPoints(): InfoCode().queryAll(): InfoCodeUtil.getInfosForProperty() 2");
|
|
|
JSONArray infos = getSplitInfos(pjId, type);
|
|
|
CommonUtil.addField(infos, "classification", "0");//0表示没有分类
|
|
|
result.addAll(infos);
|
|
|
return result;
|
|
|
}
|
|
|
if (type.startsWith(Const.OBJ_TYPE_VO)) {
|
|
|
+ log.info("======init====== TypeToInfosMap.synCache(): getAllInfoPoints(): InfoCode().queryAll(): InfoCodeUtil.getInfosForProperty() 3");
|
|
|
result.addAll(getSplitInfos(pjId, type));
|
|
|
return result;
|
|
|
}
|
|
|
//耗材
|
|
|
if (CsStaticInfo.getCode2name().keySet().contains(type)) {
|
|
|
+ log.info("======init====== TypeToInfosMap.synCache(): getAllInfoPoints(): InfoCode().queryAll(): InfoCodeUtil.getInfosForProperty() 4");
|
|
|
JSONArray commonInfos = getSplitInfos(pjId, "consumable");
|
|
|
JSONArray privInfos = getSplitInfos(pjId, type);
|
|
|
result.addAll(commonInfos);
|
|
@@ -596,6 +600,7 @@ public class InfoCodeUtil {
|
|
|
}
|
|
|
//工具
|
|
|
if (TlStaticInfo.getCode2name().keySet().contains(type)) {
|
|
|
+ log.info("======init====== TypeToInfosMap.synCache(): getAllInfoPoints(): InfoCode().queryAll(): InfoCodeUtil.getInfosForProperty() 5");
|
|
|
JSONArray commonInfos = getSplitInfos(pjId, "tool");
|
|
|
JSONArray privInfos = getSplitInfos(pjId, type);
|
|
|
result.addAll(commonInfos);
|
|
@@ -605,10 +610,12 @@ public class InfoCodeUtil {
|
|
|
EqStaticInfo eqStaticInfo = new EqStaticInfo(null);
|
|
|
//自定义字典中的类型
|
|
|
if (ctmDictId != null) {
|
|
|
+ log.info("======init====== TypeToInfosMap.synCache(): getAllInfoPoints(): InfoCode().queryAll(): InfoCodeUtil.getInfosForProperty() 6");
|
|
|
return getCtmDictWholeInfos(ctmDictId, type, eqStaticInfo);
|
|
|
}
|
|
|
|
|
|
if (eqStaticInfo.getSysSet().contains(type)) {//系统
|
|
|
+ log.info("======init====== TypeToInfosMap.synCache(): getAllInfoPoints(): InfoCode().queryAll(): InfoCodeUtil.getInfosForProperty() 7");
|
|
|
JSONArray commonInfos = getSplitInfos(pjId, "sy-gen");
|
|
|
CommonUtil.addField(commonInfos, "classification", "1");//1表示系统通用
|
|
|
JSONArray sysInfos = getSplitInfos(pjId, type);
|
|
@@ -616,6 +623,7 @@ public class InfoCodeUtil {
|
|
|
result.addAll(commonInfos);
|
|
|
result.addAll(sysInfos);
|
|
|
} else if (eqStaticInfo.getEqSet().contains(type)) {//设备
|
|
|
+ log.info("======init====== TypeToInfosMap.synCache(): getAllInfoPoints(): InfoCode().queryAll(): InfoCodeUtil.getInfosForProperty() 8");
|
|
|
JSONArray commonInfos = getSplitInfos(pjId, "eq-gen");
|
|
|
CommonUtil.addField(commonInfos, "classification", "2");//2表示设备通用
|
|
|
JSONArray familyInfos = getSplitInfos(pjId, eqStaticInfo.getEqToFamilyMap().get(type));
|
|
@@ -626,6 +634,7 @@ public class InfoCodeUtil {
|
|
|
result.addAll(familyInfos);
|
|
|
result.addAll(eqInfos);
|
|
|
} else if (eqStaticInfo.getEcSet().contains(type)) {//部件
|
|
|
+ log.info("======init====== TypeToInfosMap.synCache(): getAllInfoPoints(): InfoCode().queryAll(): InfoCodeUtil.getInfosForProperty() 9");
|
|
|
// JSONArray commonInfos = getSplitInfos("ec-gen");
|
|
|
// CommonUtil.addField(commonInfos, "classification", "3");//3表示部件通用
|
|
|
// JSONArray familyInfos = getSplitInfos(EqStaticInfo.eqToFamilyMap.get(type));
|
|
@@ -639,6 +648,7 @@ public class InfoCodeUtil {
|
|
|
result.addAll(familyInfos);
|
|
|
result.addAll(ecInfos);
|
|
|
} else if (eqStaticInfo.getFamilySet().contains(type)) {
|
|
|
+ log.info("======init====== TypeToInfosMap.synCache(): getAllInfoPoints(): InfoCode().queryAll(): InfoCodeUtil.getInfosForProperty() 10");
|
|
|
JSONArray commonInfos = new JSONArray();
|
|
|
// if (EqStaticInfo.familyMap.get(type)) {//设备种族
|
|
|
commonInfos = getSplitInfos(pjId, "eq-gen");
|