diff --git a/renren-admin/src/main/java/io/renren/common/config/RestTemplateConfig.java b/renren-admin/src/main/java/io/renren/common/config/RestTemplateConfig.java index dcaeef28..6b49e6aa 100644 --- a/renren-admin/src/main/java/io/renren/common/config/RestTemplateConfig.java +++ b/renren-admin/src/main/java/io/renren/common/config/RestTemplateConfig.java @@ -28,8 +28,8 @@ public class RestTemplateConfig { @Bean public ClientHttpRequestFactory simpleClientHttpRequestFactory() { SimpleClientHttpRequestFactory factory = new SimpleClientHttpRequestFactory(); - factory.setReadTimeout(30000);//单位为ms - factory.setConnectTimeout(30000);//单位为ms + factory.setReadTimeout(2000);//单位为ms + factory.setConnectTimeout(500);//单位为ms // SocketAddress address = new InetSocketAddress("127.0.0.1", 8888); // Proxy proxy = new Proxy(Proxy.Type.HTTP, address); diff --git a/renren-admin/src/main/java/io/renren/common/controller/CensusController.java b/renren-admin/src/main/java/io/renren/common/controller/CensusController.java index db9c40ea..0a5a7be4 100644 --- a/renren-admin/src/main/java/io/renren/common/controller/CensusController.java +++ b/renren-admin/src/main/java/io/renren/common/controller/CensusController.java @@ -91,8 +91,9 @@ public class CensusController { List> result = Collections.synchronizedList(new ArrayList<>()); CompletableFuture resourceAmount = CompletableFuture.supplyAsync(() -> { // 获取资源汇聚总量 - List> dbAmount = resourceService.getAmountGroupByType(); - Long sum = dbAmount.stream().mapToLong(index -> Long.valueOf(index.get("amount").toString())).sum(); + Map map = (Map) resourceService.selectTotal(); + List> dbAmount = (List>) map.get("total"); + Long sum = dbAmount.stream().mapToLong(index -> Long.parseLong(index.get("count").toString())).sum(); return sum; }).thenAccept(sum -> { result.add(new HashMap() { 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 c47d96ba..351ea4b5 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 @@ -249,9 +249,9 @@ public class CensusControllerV3 { @ApiImplicitParam(name = "resourceType",value = "资源类型(组件服务、应用资源、基础设施、数据资源、知识库)", paramType = "query", dataType = "String") }) public Result>> assemblerUseInfo(@ApiIgnore @RequestParam Map params){ - Object[] ps = {params.get("id"),params.get("resourceType")}; - List> maps = jdbcTemplate.queryForList("SELECT count(d.id) as num,d.attr_value FROM tb_data_resource_rel a INNER JOIN sys_user b ON a.creator = b.id INNER JOIN tb_data_resource c ON a.reference_id = c.id INNER JOIN tb_data_attr d ON c.id = d.data_resource_id\n" + - "WHERE a.del_flag = 0 AND b.dept_id = ? AND c.type = ? AND d.attr_type = '组件类型' \n" + + Object[] ps = {params.get("id"),params.get("id"),params.get("resourceType")}; + List> maps = jdbcTemplate.queryForList("SELECT count(d.id) as num,d.attr_value FROM tb_data_resource_rel a INNER JOIN sys_user b ON a.creator = b.id INNER JOIN tb_data_resource c ON a.reference_id = c.id INNER JOIN tb_data_attr d ON c.id = d.data_resource_id INNER JOIN sys_dept e ON b.dept_id = e.id\n" + + " WHERE a.del_flag = 0 AND (e.id = ? OR INSTR(e.pids,?)) AND c.type = ? AND d.attr_type = '组件类型' \n" + "GROUP BY d.attr_value", ps); return new Result>>().ok(maps); @@ -297,10 +297,10 @@ public class CensusControllerV3 { @ApiImplicitParam(name = "resourceType",value = "资源类型(组件服务、应用资源、基础设施、数据资源、知识库)", paramType = "query", dataType = "String") }) public Result>> assemblerUseScoreTopInfo(@ApiIgnore @RequestParam Map params){ - Object[] ps = {params.get("resourceType"),params.get("id")}; - List> maps = jdbcTemplate.queryForList("select AVG(a.score) as score,b.name from tb_resource_score a inner join tb_data_resource b on a.resource_id = b.id\n" + - "inner join sys_user c on a.user_id = c.id \n" + - "where a.del_flag = 0 and b.type = ? and c.dept_id = ?\n" + + Object[] ps = {params.get("resourceType"),params.get("id"),params.get("id")}; + List> maps = jdbcTemplate.queryForList("SELECT AVG(a.score) as score,b.name FROM tb_resource_score a INNER JOIN tb_data_resource b on a.resource_id = b.id\n" + + "INNER JOIN sys_dept c ON b.dept_id = c.id\n" + + "WHERE a.del_flag = 0 AND b.type = ? AND (c.id = ? OR INSTR(c.pids,?))\n" + "group by b.name order by score desc limit 5", ps); return new Result>>().ok(maps); @@ -377,7 +377,7 @@ public class CensusControllerV3 { List> maps = jdbcTemplate.queryForList("SELECT COUNT(distinct(a.key_id)) as appNum,c.attr_value FROM (\n" + "SELECT a.key_id ,a.reference_id FROM tb_data_resource_rel a INNER JOIN tb_data_resource b ON a.key_id = b.id INNER JOIN sys_dept c on b.dept_id = c.id WHERE a.del_flag = 0 AND c.id = ? OR INSTR(c.pids,?) ORDER BY a.key_id \n" + ") a \n" + - "INNER JOIN tb_data_resource b ON a.reference_id = b.id INNER JOIN tb_data_attr c \tON a.reference_id = c.data_resource_id \n" + + "INNER JOIN tb_data_resource b ON a.reference_id = b.id INNER JOIN tb_data_attr c ON a.reference_id = c.data_resource_id \n" + "WHERE c.attr_type = '组件类型' GROUP BY c.attr_value", ps); return new Result>>().ok(maps); diff --git a/renren-admin/src/main/java/io/renren/modules/demanData/service/impl/TDemandDataServiceImpl.java b/renren-admin/src/main/java/io/renren/modules/demanData/service/impl/TDemandDataServiceImpl.java index 5b40bfca..fa9ba0a4 100644 --- a/renren-admin/src/main/java/io/renren/modules/demanData/service/impl/TDemandDataServiceImpl.java +++ b/renren-admin/src/main/java/io/renren/modules/demanData/service/impl/TDemandDataServiceImpl.java @@ -54,6 +54,7 @@ public class TDemandDataServiceImpl extends CrudServiceImpl params) { return new Result().ok(resourceService.selectDeptResourceByApplyNum(params)); } + + @GetMapping("/selectInfrastructureList") + @ApiOperation("共享门户-能力汇聚-查询基础设施列表") + @LogOperation("共享门户-能力汇聚-查询基础设施列表") + public Result selectInfrastructureList() { + return new Result().ok(resourceService.selectInfrastructureList()); + } } \ 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 e6752e16..9f8c8709 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 @@ -125,4 +125,6 @@ public interface ResourceService extends CrudService ids = new ArrayList<>(); switch (orderType) { case "DESC": // total 倒序 - ids = selectDTOPageSpecilTotal.parallelStream().map(index -> (Map) index).sorted(Comparator.comparing(x -> { + ids = selectDTOPageSpecilTotal.parallelStream().map(Map.class::cast).sorted(Comparator.comparing(x -> { Map index = (Map) x; String string = (index.get("total") == null) ? "0" : index.get("total").toString(); return Long.valueOf(string); @@ -401,7 +404,7 @@ public class ResourceServiceImpl extends CrudServiceImpl (Map) index).sorted(Comparator.comparing(x -> { + ids = selectDTOPageSpecilTotal.parallelStream().map(Map.class::cast).sorted(Comparator.comparing(x -> { String string = (x.get("total") == null) ? "0" : x.get("total").toString(); return Long.valueOf(string); } @@ -499,7 +502,7 @@ public class ResourceServiceImpl extends CrudServiceImpl index != null).findAny().orElse(0l); + return result_.stream().filter(Objects::nonNull).findAny().orElse(0l); }).thenAccept(sum -> { re.add(new HashMap() { { @@ -544,6 +547,15 @@ public class ResourceServiceImpl extends CrudServiceImpl() { + { + QueryWrapper queryWrapper = new QueryWrapper<>(); + put("count", cameraChannelMapper.selectCount(queryWrapper) + ""); + put("type", "基础设施"); + } + }); + } break; } @@ -581,7 +593,8 @@ public class ResourceServiceImpl extends CrudServiceImpl updateWrapper = new UpdateWrapper<>(); - updateWrapper.lambda().eq(ResourceEntity::getId, resourceEntity.getId()).eq(ResourceEntity::getDelFlag, ResourceEntityDelFlag.NORMAL.getFlag()); + updateWrapper.lambda().eq(ResourceEntity::getId, resourceEntity.getId()) + .eq(ResourceEntity::getDelFlag, ResourceEntityDelFlag.NORMAL.getFlag()); resourceDao.update(entity, updateWrapper); ResourceBrowseEntity browseEntity = new ResourceBrowseEntity(); browseEntity.setResourceId(id); @@ -1096,7 +1109,7 @@ public class ResourceServiceImpl extends CrudServiceImpl>> partition = Lists.partition(result2, pageSize); result.addAll(partition.get(page)); } else { - return new PageData<>(result2, result2.size()); + return new PageData<>(result2, 0); } ConcurrentHashMap hashMap = new ConcurrentHashMap(); @@ -1640,6 +1653,21 @@ public class ResourceServiceImpl extends CrudServiceImpl() {{ + Map map = (Map) selectTotal(); + List> list = (List>) map.get("total"); + list.forEach(index ->{ + if ("基础设施".equals(index.get("type").toString())) { + put("视频资源", Integer.parseInt(index.get("count").toString())); + } + }); + put("感知资源", 0); + put("云资源", 0); + }}; + } + private List getSourceIdsByProcess(List list) { List resourceIds = new ArrayList<>(); for (HistoricProcessInstance his : list) { diff --git a/renren-admin/src/main/resources/mapper/processForm/TAbilityApplicationDao.xml b/renren-admin/src/main/resources/mapper/processForm/TAbilityApplicationDao.xml index 85236d64..66132722 100644 --- a/renren-admin/src/main/resources/mapper/processForm/TAbilityApplicationDao.xml +++ b/renren-admin/src/main/resources/mapper/processForm/TAbilityApplicationDao.xml @@ -50,11 +50,9 @@ @@ -516,6 +517,7 @@ tb_data_resource WHERE del_flag = 0 + AND type != '赋能案例' GROUP BY type @@ -1077,9 +1079,9 @@ COUNT( tdav.data_resource_id ) AS total FROM ( select a.* from tb_data_attr a inner join tb_data_resource d on a.data_resource_id = d.id - inner join tb_data_resource_rel e on e.reference_id = d.id inner join sys_user f on e.creator = f.id where - d.type=#{resourceType} - and f.dept_id = #{id} + inner join tb_data_resource_rel e on e.reference_id = d.id inner join sys_user f on e.creator = f.id + inner join sys_dept g on f.dept_id = g.id + where d.type=#{resourceType} and (g.id = #{id} OR instr(g.pids,#{id})) ) tdav JOIN mysql.help_topic b ON b.help_topic_id < ( LENGTH( tdav.attr_value ) - LENGTH( REPLACE ( tdav.attr_value, ';', '' ) ) + 1 ) diff --git a/renren-admin/src/main/resources/mapper/resource/TbDataResourceRelDao.xml b/renren-admin/src/main/resources/mapper/resource/TbDataResourceRelDao.xml index a90d9831..ec2332fd 100644 --- a/renren-admin/src/main/resources/mapper/resource/TbDataResourceRelDao.xml +++ b/renren-admin/src/main/resources/mapper/resource/TbDataResourceRelDao.xml @@ -72,8 +72,6 @@