diff --git a/renren-admin/src/main/java/io/renren/modules/resource/controller/CIMController.java b/renren-admin/src/main/java/io/renren/modules/resource/controller/CIMController.java index e3a3644b..7dcd2eac 100644 --- a/renren-admin/src/main/java/io/renren/modules/resource/controller/CIMController.java +++ b/renren-admin/src/main/java/io/renren/modules/resource/controller/CIMController.java @@ -10,6 +10,7 @@ import org.slf4j.LoggerFactory; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.web.bind.annotation.GetMapping; import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.RequestParam; import org.springframework.web.bind.annotation.RestController; import java.util.List; @@ -46,4 +47,18 @@ public class CIMController { return new Result>().ok(cimService.getCIMApplyApplicationList()); } + @GetMapping("/cimImgResources") + @ApiOperation("根据应用领域查询图层服务") + public Result cimImgResources(@RequestParam String type){ + List imgServices = cimService.getImgServices(type); + return new Result().ok(imgServices); + } + + @GetMapping("/cimAssemblyResources") + @ApiOperation("查询智能算法组件") + public Result cimAssemblyResources(){ + List maps = cimService.cimAssemblyResources(); + return new Result().ok(maps); + } + } 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 95fc2e35..480de728 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 @@ -180,4 +180,9 @@ public interface ResourceDao extends BaseDao { List countByCIMType(@Param("deptId") Long deptId); List getCIMApplyApplicationList(@Param("deptId") Long deptId); + + + List getImgServices(@Param("type") String type); + + List cimAssemblyResources(); } \ No newline at end of file diff --git a/renren-admin/src/main/java/io/renren/modules/resource/service/CIMService.java b/renren-admin/src/main/java/io/renren/modules/resource/service/CIMService.java index 6d51eebe..9127f2ba 100644 --- a/renren-admin/src/main/java/io/renren/modules/resource/service/CIMService.java +++ b/renren-admin/src/main/java/io/renren/modules/resource/service/CIMService.java @@ -8,4 +8,8 @@ public interface CIMService { List countByType(); List getCIMApplyApplicationList(); + + List getImgServices(String type); + + List cimAssemblyResources(); } diff --git a/renren-admin/src/main/java/io/renren/modules/resource/service/impl/CIMServiceImpl.java b/renren-admin/src/main/java/io/renren/modules/resource/service/impl/CIMServiceImpl.java index b592517f..32a29f9b 100644 --- a/renren-admin/src/main/java/io/renren/modules/resource/service/impl/CIMServiceImpl.java +++ b/renren-admin/src/main/java/io/renren/modules/resource/service/impl/CIMServiceImpl.java @@ -69,4 +69,20 @@ public class CIMServiceImpl implements CIMService { } return resourceDao.getCIMApplyApplicationList(sysDeptEntity.getId()); } + + @Override + public List getImgServices(String type) { + List imgServices = new ArrayList<>(); + imgServices = resourceDao.getImgServices(type); + + return imgServices; + } + + @Override + public List cimAssemblyResources() { + List result = new ArrayList<>(); + result = resourceDao.cimAssemblyResources(); + + return result; + } } diff --git a/renren-admin/src/main/resources/mapper/resource/ResourceDao.xml b/renren-admin/src/main/resources/mapper/resource/ResourceDao.xml index 365c2db0..acc7c070 100644 --- a/renren-admin/src/main/resources/mapper/resource/ResourceDao.xml +++ b/renren-admin/src/main/resources/mapper/resource/ResourceDao.xml @@ -1629,4 +1629,28 @@ ORDER BY tdr.create_date + + + + \ No newline at end of file