diff --git a/renren-admin/src/main/java/io/renren/common/controller/CensusControllerV3.java b/renren-admin/src/main/java/io/renren/common/controller/CensusControllerV3.java index eec9ed3c..96d8408f 100644 --- a/renren-admin/src/main/java/io/renren/common/controller/CensusControllerV3.java +++ b/renren-admin/src/main/java/io/renren/common/controller/CensusControllerV3.java @@ -256,7 +256,7 @@ public class CensusControllerV3 { @ApiImplicitParam(name = "resourceType",value = "资源类型(组件服务、应用资源、基础设施、数据资源、知识库)", paramType = "query", dataType = "String") }) public Result>> applicationAreaCapabilitySet(@ApiIgnore @RequestParam Map params) { - return new Result>>().ok(resourceService.applicationAreaCapabilitySet(params)); + return new Result>>().ok(resourceService.applicationAreaCapabilityList(params)); } diff --git a/renren-admin/src/main/java/io/renren/modules/resource/dao/ResourceDao.java b/renren-admin/src/main/java/io/renren/modules/resource/dao/ResourceDao.java index 7bd1d012..7ce8c305 100644 --- a/renren-admin/src/main/java/io/renren/modules/resource/dao/ResourceDao.java +++ b/renren-admin/src/main/java/io/renren/modules/resource/dao/ResourceDao.java @@ -119,5 +119,5 @@ public interface ResourceDao extends BaseDao { Integer selectResourceShare(Map params); // List> selectDeptList(Map params); List> selectResurceCarDetails(Map params); - List> applicationAreaCapabilitySet(Map params); + List> applicationAreaCapabilityList(Map params); } \ No newline at end of file diff --git a/renren-admin/src/main/java/io/renren/modules/resource/service/ResourceService.java b/renren-admin/src/main/java/io/renren/modules/resource/service/ResourceService.java index 75dc0110..99034ea8 100644 --- a/renren-admin/src/main/java/io/renren/modules/resource/service/ResourceService.java +++ b/renren-admin/src/main/java/io/renren/modules/resource/service/ResourceService.java @@ -93,5 +93,5 @@ public interface ResourceService extends CrudService> resourceDatasDetails(Map params); List> resourceKnowledgeDetails(Map params); List> assemblerCarDetail(Map params); - List> applicationAreaCapabilitySet(Map params); + List> applicationAreaCapabilityList(Map params); } \ No newline at end of file diff --git a/renren-admin/src/main/java/io/renren/modules/resource/service/impl/ResourceServiceImpl.java b/renren-admin/src/main/java/io/renren/modules/resource/service/impl/ResourceServiceImpl.java index 7df6b7d3..ade0819e 100644 --- a/renren-admin/src/main/java/io/renren/modules/resource/service/impl/ResourceServiceImpl.java +++ b/renren-admin/src/main/java/io/renren/modules/resource/service/impl/ResourceServiceImpl.java @@ -733,6 +733,10 @@ public class ResourceServiceImpl extends CrudServiceImpl> applicationAreaCapabilityList(Map params){ + return resourceDao.applicationAreaCapabilityList(params); + } @Override public Object selectResourceListByType(String type) { return resourceDao.selectByType(type); @@ -1181,7 +1185,7 @@ public class ResourceServiceImpl extends CrudServiceImpl +