|
@@ -7,6 +7,7 @@ import com.dragoninfo.dcuc.app.dto.dataresource.ResourceClassify;
|
|
|
import com.dragoninfo.dcuc.app.dto.sub.DataClaAcceptDTO;
|
|
|
import com.dragoninfo.dcuc.app.dto.sub.FieldClaAcceptDTO;
|
|
|
import com.dragoninfo.dcuc.app.entity.sub.*;
|
|
|
+import com.dragoninfo.dcuc.app.enumresources.AppDataTypeEnum;
|
|
|
import com.dragoninfo.dcuc.app.enumresources.DataAttrTypeEnum;
|
|
|
import com.dragoninfo.dcuc.app.enumresources.DataResourceEnum;
|
|
|
import com.dragoninfo.dcuc.app.enumresources.sub.DataClaTypeEnum;
|
|
@@ -837,7 +838,7 @@ public class DataResourceFacade implements IDataResourceFacade {
|
|
|
vo.setId(e.getId());
|
|
|
vo.setPId(pid);
|
|
|
vo.setLabel(e.getTableName());
|
|
|
- vo.setDataType(DataResourceEnum.TAB.getCode());
|
|
|
+ vo.setDataType(AppDataTypeEnum.TAB.getValue());
|
|
|
if (null != colInfosMap) {
|
|
|
List<AppDataItemInfo> colInfoList = colInfosMap.get(e.getDataObjectId());
|
|
|
if (CollectionUtils.isNotEmpty(colInfoList)) {
|
|
@@ -859,7 +860,7 @@ public class DataResourceFacade implements IDataResourceFacade {
|
|
|
vo.setId(e.getId());
|
|
|
vo.setPId(pid);
|
|
|
vo.setLabel(e.getColumnName());
|
|
|
- vo.setDataType(DataResourceEnum.COL.getCode());
|
|
|
+ vo.setDataType(AppDataTypeEnum.COL.getValue());
|
|
|
return vo;
|
|
|
}).collect(Collectors.toList());
|
|
|
}
|