|
@@ -6,7 +6,7 @@ import com.fasterxml.jackson.databind.node.ArrayNode;
|
|
|
import com.fasterxml.jackson.databind.node.JsonNodeFactory;
|
|
|
import com.fasterxml.jackson.databind.node.ObjectNode;
|
|
|
import com.persagy.dmp.basic.model.QueryCriteria;
|
|
|
-import com.persagy.dmp.delivery.entity.ObjectInfoCollect;
|
|
|
+import com.persagy.dmp.define.entity.ObjectInfoCollect;
|
|
|
import com.persagy.proxy.adm.constant.AdmCommonConstant;
|
|
|
import com.persagy.proxy.adm.constant.AdmDictConstant;
|
|
|
import com.persagy.proxy.adm.constant.AdmDictCategoryEnum;
|
|
@@ -176,7 +176,7 @@ public class AdmDictServiceImpl<T> extends AbstractAdmDictBaseServiceImpl<T> imp
|
|
|
}else{
|
|
|
major.setChildren(systemCodes);
|
|
|
}
|
|
|
-
|
|
|
+
|
|
|
//系统下的设备类
|
|
|
if(CollUtil.isNotEmpty(systemEquipMap) && CollUtil.isNotEmpty(systemCodes)){
|
|
|
for (AdmObjectType systemType : systemCodes) {
|
|
@@ -307,7 +307,7 @@ public class AdmDictServiceImpl<T> extends AbstractAdmDictBaseServiceImpl<T> imp
|
|
|
infoCollect.setDefineInfoId(funcIdGather.getId());
|
|
|
infoCollect.setClassCode(funcIdGather.getClassCode());
|
|
|
infoCollect.setCode(funcIdGather.getCode());
|
|
|
- infoCollect.setIsDelivery(funcIdGather.getVisible());
|
|
|
+ infoCollect.setVisiable(funcIdGather.getVisible());
|
|
|
infoCollect.setKeyWord(funcIdGather.getKeyWord());
|
|
|
list.add((T) infoCollect);
|
|
|
}
|
|
@@ -439,7 +439,7 @@ public class AdmDictServiceImpl<T> extends AbstractAdmDictBaseServiceImpl<T> imp
|
|
|
* @param request
|
|
|
*/
|
|
|
private void revertSortField(AdmDictQueryCriteria request){
|
|
|
- request.setOrders("showOrder asc, name desc");
|
|
|
+ request.setOrders("showOrder asc, name desc");
|
|
|
}
|
|
|
|
|
|
/**
|
|
@@ -457,7 +457,7 @@ public class AdmDictServiceImpl<T> extends AbstractAdmDictBaseServiceImpl<T> imp
|
|
|
if(CollUtil.isNotEmpty(objectInfoCollectMap)){
|
|
|
ObjectInfoCollect collect = objectInfoCollectMap.get(id);
|
|
|
if(collect != null){
|
|
|
- visiable = collect.getIsDelivery();
|
|
|
+ visiable = collect.getVisiable();
|
|
|
admObjectInfo.setKeyWord(collect.getKeyWord());
|
|
|
}
|
|
|
}
|
|
@@ -497,7 +497,7 @@ public class AdmDictServiceImpl<T> extends AbstractAdmDictBaseServiceImpl<T> imp
|
|
|
if(CollUtil.isNotEmpty(objectInfoCollectMap)){
|
|
|
ObjectInfoCollect collect = objectInfoCollectMap.get(id);
|
|
|
if(collect!=null){
|
|
|
- visiable = collect.getIsDelivery();
|
|
|
+ visiable = collect.getVisiable();
|
|
|
admObjectInfo.setKeyWord(collect.getKeyWord());
|
|
|
}
|
|
|
}
|