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-07-22 15:45:47 +08:00
parent 0dc2b4eac3 6c06060b16
commit fe3c6bb939
5 changed files with 13 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
renren-admin/src/main/java/io/renren/common/controller/CensusController.java
View File

@ -308,7 +308,7 @@ public class CensusController {
} catch (JsonProcessingException e) {
throw new RuntimeException(e);
}
}).reversed().thenComparing(i -> i.toString())
}).reversed().thenComparing(Object::toString)
); // 按应用领域数目逆序排序
return new Result<List<Map<String, Object>>>().ok(result);
}

2
renren-admin/src/main/java/io/renren/modules/resource/dto/ResourceDTO.java
View File

@ -92,6 +92,8 @@ public class ResourceDTO extends AuditingBaseDTO implements Serializable {
private String applyCount;
@ApiModelProperty(value = "部门ID集合")
private List<Long> deptIds;
@ApiModelProperty(value = "是否在申购车内")
private Boolean isInShoppingCart;
@ApiModelProperty(value = "属性信息")

2
renren-admin/src/main/java/io/renren/modules/resource/service/impl/ResourceServiceImpl.java
View File

@ -1077,7 +1077,7 @@ public class ResourceServiceImpl extends CrudServiceImpl<ResourceDao, ResourceEn
return resourceList;
} else if ("数据资源".equals(type)) {
GetDataResourceListDto dto = new GetDataResourceListDto();
dto.setPageNum(0);
dto.setPageNum(1);
dto.setPageSize(30);
Optional<AbstractDataResourceService> factory = DataResourceFactory.build();
if (factory.isPresent()) {

2
renren-admin/src/main/java/io/renren/modules/security/config/ShiroConfig.java
View File

@ -31,7 +31,7 @@ public class ShiroConfig {
DefaultWebSessionManager sessionManager = new DefaultWebSessionManager();
sessionManager.setSessionValidationSchedulerEnabled(false);
sessionManager.setSessionIdUrlRewritingEnabled(false);
sessionManager.setGlobalSessionTimeout(-1000l);
return sessionManager;
}

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

@ -105,13 +105,15 @@
IFNULL(trc.collectCount, 0) AS "collectCount",
IFNULL(sd.name, '暂无部门单位信息') AS "deptName",
IFNULL(trc2.isCollect, 'false') AS "isCollect",
(IFNULL(tdr.visits / 100, 0) + IFNULL(trs.score, 0) + IFNULL(taa.applyCount, 0)+ IFNULL(trc.collectCount, 0)) AS
total
(IFNULL(tdr.visits / 100, 0) + IFNULL(trs.score, 0) + IFNULL(taa.applyCount, 0)+ IFNULL(trc.collectCount, 0)) AS total,
IF ( IFNULL( trcar.car, 0 ) &gt; 0, TRUE, FALSE ) AS "isInShoppingCart"
FROM
tb_data_resource tdr
LEFT JOIN tb_data_attr tda ON tdr.id = tda.data_resource_id
LEFT JOIN ( SELECT resource_id, AVG(score) AS "score" FROM tb_resource_score WHERE 1 = 1 AND del_flag = 0 GROUP
BY resource_id ) trs ON tdr.id = trs.resource_id
LEFT JOIN ( SELECT resource_id, COUNT( id ) AS "car" FROM tb_resource_car WHERE 1 = 1 AND del_flag = 0 GROUP BY resource_id ) trcar
ON tdr.id = trcar.resource_id
LEFT JOIN ( SELECT resource_id, COUNT(id) AS "applyCount" FROM t_ability_application WHERE 1 = 1 AND del_flag =
0 GROUP BY resource_id ) taa ON tdr.id = taa.resource_id
LEFT JOIN ( SELECT resource_id, COUNT(id) AS "collectCount" FROM tb_resource_collection WHERE 1 = 1 AND del_flag
@ -360,11 +362,14 @@
IFNULL(trc.collectCount, 0) AS "collectCount",
sd.name AS "deptName",
IFNULL(trc2.isCollect, 'false') AS "isCollect",
IFNULL(taa2.approve_status, '未申请') AS "applyState"
IFNULL(taa2.approve_status, '未申请') AS "applyState",
IF ( IFNULL( trcar.car, 0 ) &gt; 0, TRUE, FALSE ) AS "isInShoppingCart"
FROM
tb_data_resource tdr
LEFT JOIN ( SELECT resource_id, AVG(score) AS "score" FROM tb_resource_score WHERE 1 = 1 AND del_flag = 0 GROUP
BY resource_id ) trs ON tdr.id = trs.resource_id
LEFT JOIN ( SELECT resource_id, COUNT( id ) AS "car" FROM tb_resource_car WHERE 1 = 1 AND del_flag = 0 GROUP BY resource_id ) trcar
ON tdr.id = trcar.resource_id
LEFT JOIN ( SELECT resource_id, COUNT(id) AS "applyCount" FROM t_ability_application WHERE 1 = 1 AND del_flag =
0 GROUP BY resource_id ) taa ON tdr.id = taa.resource_id
LEFT JOIN ( SELECT resource_id, COUNT(id) AS "collectCount" FROM tb_resource_collection WHERE 1 = 1 AND del_flag