wangliwen
/
share-platform
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Merge branch 'master' into docker_package

This commit is contained in:
wangliwen 2022-08-19 15:53:52 +08:00
parent fcfff400fc aa3a132421
commit 22f897ddb9
5 changed files with 36 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
renren-admin/src/main/java/io/renren/modules/resource/controller/CIMController.java
View File

@ -48,17 +48,17 @@ public class CIMController {
}
@GetMapping("/cimImgResources")
@ApiOperation("根据应用领域查询图层服务")
public Result cimImgResources(@RequestParam String type){
List<Map> imgServices = cimService.getImgServices(type);
return new Result().ok(imgServices);
@ApiOperation("CIM平台根据应用领域查询图层服务")
@LogOperation(value = "CIM平台根据应用领域查询图层服务")
public Result<List<Map>> cimImgResources(@RequestParam String type){
return new Result<List<Map>>().ok(cimService.getImgServices(type));
}
@GetMapping("/cimAssemblyResources")
@ApiOperation("查询智能算法组件")
public Result cimAssemblyResources(){
List<Map> maps = cimService.cimAssemblyResources();
return new Result().ok(maps);
@ApiOperation("CIM平台查询智能算法组件")
@LogOperation(value = "CIM平台查询智能算法组件")
public Result<List<Map>> cimAssemblyResources(){
return new Result<List<Map>>().ok(cimService.cimAssemblyResources());
}
}

4
renren-admin/src/main/java/io/renren/modules/resource/dao/ResourceDao.java
View File

@ -182,7 +182,7 @@ public interface ResourceDao extends BaseDao<ResourceEntity> {
List<Map> getCIMApplyApplicationList(@Param("deptId") Long deptId);
List<Map> getImgServices(@Param("type") String type);
List<Map> getImgServices(@Param("deptid") Long deptid,@Param("type") String type);
List<Map> cimAssemblyResources();
List<Map> cimAssemblyResources(@Param("deptid") Long deptid);
}

12
renren-admin/src/main/java/io/renren/modules/resource/service/impl/CIMServiceImpl.java
View File

@ -72,16 +72,24 @@ public class CIMServiceImpl implements CIMService {
@Override
public List<Map> getImgServices(String type) {
SysDeptEntity sysDeptEntity = sysDeptDao.getByName(zjjName);
if (ObjectUtil.isEmpty(sysDeptEntity)) {
return new ArrayList<>();
}
List<Map> imgServices = new ArrayList<>();
imgServices = resourceDao.getImgServices(type);
imgServices = resourceDao.getImgServices(sysDeptEntity.getId(),type);
return imgServices;
}
@Override
public List<Map> cimAssemblyResources() {
SysDeptEntity sysDeptEntity = sysDeptDao.getByName(zjjName);
if (ObjectUtil.isEmpty(sysDeptEntity)) {
return new ArrayList<>();
}
List<Map> result = new ArrayList<>();
result = resourceDao.cimAssemblyResources();
result = resourceDao.cimAssemblyResources(sysDeptEntity.getId());
return result;
}

5
renren-admin/src/main/resources/db/V5.2__add_model.sql Normal file
View File

File diff suppressed because one or more lines are too long

19
renren-admin/src/main/resources/mapper/resource/ResourceDao.xml
View File

@ -1630,27 +1630,30 @@
tdr.create_date
</select>
<select id="getImgServices" parameterType="java.lang.String" resultType="java.util.Map">
<select id="getImgServices" resultType="java.util.Map">
with A as
(
SELECT m.* FROM
(
SELECT a.name,a.id,a.info_list FROM tb_data_resource a INNER JOIN tb_data_attr b ON a.id = b.data_resource_id
WHERE a.dept_id = 1555080592128163841 AND a.del_flag = 0 and a.type = '组件服务'
WHERE a.dept_id = #{deptid} AND a.del_flag = 0 and a.type = '组件服务'
AND (b.attr_type = '组件类型' AND b.attr_value = '图层服务' ) AND b.del_flag = 0
) m
INNER JOIN tb_data_attr b ON m.id = b.data_resource_id
AND b.attr_type = '应用领域' AND LOCATE(#{type},b.attr_value) AND b.del_flag = 0
)
SELECT A.*,c.attr_value as link FROM A INNER JOIN tb_data_attr c ON A.id = c.data_resource_id
AND c.attr_type = '图层缩略图' AND c.del_flag = 0
AND c.attr_type = '图层缩略图' AND c.del_flag = 0
</select>
<select id="cimAssemblyResources" resultType="java.util.Map">
SELECT a.name,a.id,a.info_list FROM tb_data_resource a INNER JOIN tb_data_attr b ON a.id = b.data_resource_id
WHERE a.dept_id = 1555080592128163841 AND a.type = '组件服务' AND a.del_flag = 0
AND (b.attr_type = '组件类型' AND b.attr_value = '智能算法' ) AND b.del_flag = 0
SELECT a.name,a.id
FROM tb_data_resource a INNER JOIN tb_data_attr b ON a.id = b.data_resource_id
WHERE
a.dept_id = #{deptid}
AND a.type = '组件服务'
AND a.del_flag = 0
AND (b.attr_type = '组件类型' AND b.attr_value = '智能算法' )
AND b.del_flag = 0
</select>
</mapper>