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

Merge branch 'dev'

This commit is contained in:
wangliwen 2022-11-29 13:17:35 +08:00
parent 2719a1aa6c 476b88a806
commit e4b3caeb0c
7 changed files with 63 additions and 42 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
renren-admin/src/main/java/io/renren/modules/processForm/service/impl/TAbilityApplicationServiceImpl.java
View File

@ -292,7 +292,9 @@ public class TAbilityApplicationServiceImpl extends CrudServiceImpl<TAbilityAppl
@Override @Override
public Object getApplyPriceCount() { public Object getApplyPriceCount() {
Long sum = abilityApplicationDao.getFundStatementSum(new HashMap<>()); Map<String, Object> map = new HashMap<>();
map.put("applyResult", "通过");
Long sum = abilityApplicationDao.getFundStatementSum(map);
BigDecimal result = new BigDecimal(sum).divide(new BigDecimal(10000)); BigDecimal result = new BigDecimal(sum).divide(new BigDecimal(10000));
result = result.setScale(1, BigDecimal.ROUND_HALF_UP); result = result.setScale(1, BigDecimal.ROUND_HALF_UP);
return result ; return result ;

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

@ -223,4 +223,6 @@ public interface ResourceDao extends BaseDao<ResourceEntity> {
List<Map> getAppListByDept(@Param("deptId") Long deptId, @Param("key") String key); List<Map> getAppListByDept(@Param("deptId") Long deptId, @Param("key") String key);
Integer updateByDelProcinst(@Param("resourceId") Long resourceId); Integer updateByDelProcinst(@Param("resourceId") Long resourceId);
Integer selectYzyCount();
} }

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

@ -713,24 +713,37 @@ public class ResourceServiceImpl extends CrudServiceImpl<ResourceDao, ResourceEn
} }
break; break;
case TSINGTAO: { case TSINGTAO: {
//青岛市局数据资源 //青岛市局数据资源
TsingtaoDataResourceService tsingtaoDataResourceService = new TsingtaoDataResourceService(); CompletableFuture sjzy = CompletableFuture.runAsync(() -> {
GetDataResourceListDto getDataResourceListDto = new GetDataResourceListDto().setPageNum(1).setPageSize(5); TsingtaoDataResourceService tsingtaoDataResourceService = new TsingtaoDataResourceService();
HashMap dataResource = (HashMap) tsingtaoDataResourceService.getDataResource(getDataResourceListDto); GetDataResourceListDto getDataResourceListDto = new GetDataResourceListDto().setPageNum(1).setPageSize(5);
re.add(new HashMap<String, Object>() { HashMap dataResource = (HashMap) tsingtaoDataResourceService.getDataResource(getDataResourceListDto);
{ re.add(new HashMap<String, Object>() {
put("count", null == dataResource ? "0" : dataResource.get("rows") + ""); {
put("type", "数据资源"); put("count", null == dataResource ? "0" : dataResource.get("rows") + "");
} put("type", "数据资源");
}); }
re.add(new HashMap<String, Object>() { });
{ }, executor);
QueryWrapper<CameraChannel> queryWrapper = new QueryWrapper<>();
queryWrapper.eq("check_status", 1).ne("gps_x", "").ne("gps_y", "").isNotNull("gps_x").isNotNull("gps_y"); //基础设施
put("count", cameraChannelMapper.selectCount(queryWrapper) + ""); CompletableFuture jcss = CompletableFuture.runAsync(() -> {
put("type", "基础设施"); HashMap<String, Object> map = (HashMap<String, Object>) this.selectInfrastructureList();
} final Long[] total = {0L};
}); map.forEach((k,v) -> {
total[0] = total[0] + (Integer) v;
});
re.add(new HashMap<String, Object>() {
{
put("count", total[0]);
put("type", "基础设施");
}
});
}, executor);
CompletableFuture all = CompletableFuture.allOf(sjzy, jcss);
all.join();
} }
break; break;
@ -1939,16 +1952,19 @@ public class ResourceServiceImpl extends CrudServiceImpl<ResourceDao, ResourceEn
@Override @Override
public Object selectInfrastructureList() { public Object selectInfrastructureList() {
HashMap<String, Object> resultMap = new HashMap<>(); HashMap<String, Object> resultMap = new HashMap<>();
resultMap.put("云资源", 0); //云资源
CompletableFuture<Void> yzy = CompletableFuture.runAsync(() -> {
resultMap.put("云资源", resourceDao.selectYzyCount());
}, executor);
//视频资源 //视频资源
CompletableFuture<Void> jcss = CompletableFuture.runAsync(() -> { CompletableFuture<Void> jcss = CompletableFuture.runAsync(() -> {
Map map = (Map) selectTotal();
List<Map<String, Object>> list = (List<Map<String, Object>>) map.get("total"); QueryWrapper<CameraChannel> queryWrapper = new QueryWrapper<>();
list.forEach(index -> { queryWrapper.eq("check_status", 1).ne("gps_x", "").ne("gps_y", "").isNotNull("gps_x").isNotNull("gps_y");
if ("基础设施".equals(index.get("type").toString())) { resultMap.put("视频资源", cameraChannelMapper.selectCount(queryWrapper));
resultMap.put("视频资源", Integer.parseInt(index.get("count").toString()));
}
});
}, executor); }, executor);
//新增会客厅和视频会议统计 //新增会客厅和视频会议统计

1
renren-admin/src/main/java/io/renren/modules/sys/controller/SysUserController.java
View File

@ -197,7 +197,6 @@ public class SysUserController {
} }
@GetMapping("/getApproverUnconfiguredDepartment") @GetMapping("/getApproverUnconfiguredDepartment")
@ApiOperation("查询未配置部门审核人部门列表") @ApiOperation("查询未配置部门审核人部门列表")
@LogOperation("查询未配置部门审核人部门列表") @LogOperation("查询未配置部门审核人部门列表")

26
renren-admin/src/main/resources/mapper/processForm/TAbilityApplicationDao.xml
View File

@ -724,7 +724,7 @@
t_ability_application taa t_ability_application taa
WHERE WHERE
taa.del_flag = 0 taa.del_flag = 0
AND taa.approve_status IN ( '通过', '审核中' ) AND taa.approve_status = '通过'
GROUP BY GROUP BY
resource_id resource_id
) taa ON taa.resource_id = tdr.id ) taa ON taa.resource_id = tdr.id
@ -748,7 +748,7 @@
t_meetingroom_book tmb t_meetingroom_book tmb
LEFT JOIN ( SELECT id, NAME, district FROM sys_dept ) sd ON tmb.dept = sd.NAME LEFT JOIN ( SELECT id, NAME, district FROM sys_dept ) sd ON tmb.dept = sd.NAME
WHERE WHERE
tmb.state IN ( 0, 2 ) tmb.state = 0
GROUP BY GROUP BY
sd.id, sd.id,
tmb.dept tmb.dept
@ -787,7 +787,7 @@
t_ability_application taa t_ability_application taa
WHERE WHERE
taa.del_flag = 0 taa.del_flag = 0
AND taa.approve_status IN ( '通过', '审核中' ) AND taa.approve_status = '通过'
GROUP BY GROUP BY
resource_id resource_id
) taa ON taa.resource_id = tdr.id ) taa ON taa.resource_id = tdr.id
@ -816,7 +816,7 @@
t_ability_application taa t_ability_application taa
WHERE WHERE
taa.del_flag = 0 taa.del_flag = 0
AND taa.approve_status IN ( '通过', '审核中' ) AND taa.approve_status = '通过'
GROUP BY GROUP BY
resource_id resource_id
) taa ) taa
@ -836,9 +836,7 @@
FROM FROM
t_meetingroom_book tmb t_meetingroom_book tmb
WHERE WHERE
tmb.state IN ( tmb.state = 0
0,
2)
</select> </select>
<select id="getProvideDeptFundStatement" resultType="java.util.Map"> <select id="getProvideDeptFundStatement" resultType="java.util.Map">
@ -868,7 +866,7 @@
t_ability_application taa t_ability_application taa
WHERE WHERE
taa.del_flag = 0 taa.del_flag = 0
AND taa.approve_status IN ( '通过', '审核中' ) AND taa.approve_status = '通过'
GROUP BY GROUP BY
resource_id resource_id
) taa ON taa.resource_id = tdr.id ) taa ON taa.resource_id = tdr.id
@ -889,7 +887,7 @@
LEFT JOIN t_meetingroom_book tmb ON tmb.room_id = tm.id LEFT JOIN t_meetingroom_book tmb ON tmb.room_id = tm.id
WHERE WHERE
tm.del_flag = 0 tm.del_flag = 0
AND tmb.state IN ( 0, 2 ) AND tmb.state = 0
) temp ) temp
GROUP BY GROUP BY
deptId, deptId,
@ -924,7 +922,7 @@
t_ability_application taa t_ability_application taa
WHERE WHERE
taa.del_flag = 0 taa.del_flag = 0
AND taa.approve_status IN ( '通过', '审核中' ) AND taa.approve_status = '通过'
GROUP BY GROUP BY
user_id user_id
) taa ) taa
@ -945,7 +943,7 @@
t_meetingroom_book tmb t_meetingroom_book tmb
LEFT JOIN ( SELECT id, NAME FROM sys_dept ) sd ON tmb.dept = sd.NAME LEFT JOIN ( SELECT id, NAME FROM sys_dept ) sd ON tmb.dept = sd.NAME
WHERE WHERE
tmb.state IN ( 0, 2 ) tmb.state = 0
GROUP BY GROUP BY
sd.id, sd.id,
tmb.dept tmb.dept
@ -970,7 +968,7 @@
LEFT JOIN sys_user su ON su.dept_id = sd.id LEFT JOIN sys_user su ON su.dept_id = sd.id
LEFT JOIN (SELECT user_id, SUM(apply_price) AS "apply_price", COUNT(id) AS "applyCount" FROM t_ability_application taa WHERE LEFT JOIN (SELECT user_id, SUM(apply_price) AS "apply_price", COUNT(id) AS "applyCount" FROM t_ability_application taa WHERE
taa.del_flag = 0 taa.del_flag = 0
AND taa.approve_status IN ( '通过', '审核中' ) GROUP BY user_id ) taa ON taa.user_id = su.id AND taa.approve_status = '通过' GROUP BY user_id ) taa ON taa.user_id = su.id
GROUP BY GROUP BY
srg.id srg.id
ORDER BY srg.sort ORDER BY srg.sort
@ -1005,7 +1003,7 @@
t_ability_application taa t_ability_application taa
WHERE WHERE
taa.del_flag = 0 taa.del_flag = 0
AND taa.approve_status IN ( '通过', '审核中' ) AND taa.approve_status = '通过'
GROUP BY GROUP BY
resource_id resource_id
) taa ON taa.resource_id = tdr.id ) taa ON taa.resource_id = tdr.id
@ -1031,7 +1029,7 @@
t_meetingroom_book tmb t_meetingroom_book tmb
LEFT JOIN ( SELECT id, NAME, district FROM sys_dept ) sd ON tmb.dept = sd.NAME LEFT JOIN ( SELECT id, NAME, district FROM sys_dept ) sd ON tmb.dept = sd.NAME
WHERE WHERE
tmb.state IN ( 0, 2 ) tmb.state = 0
GROUP BY GROUP BY
sd.id, sd.id,
tmb.dept tmb.dept

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

@ -2337,4 +2337,8 @@
ORDER BY create_date DESC ORDER BY create_date DESC
</select> </select>
<select id="selectYzyCount" resultType="java.lang.Integer">
SELECT COUNT(1) FROM policy_cloud_service
</select>
</mapper> </mapper>

2
renren-admin/src/main/resources/mapper/sys/SysUserDao.xml
View File

@ -163,7 +163,7 @@
AND su.id = sru.user_id AND su.id = sru.user_id
AND sru.role_id = sr.id AND sru.role_id = sr.id
AND sd.district = srg.id AND sd.district = srg.id
AND sru.del_falg = 0 AND sru.del_flag = 0
AND sr.`name` = '区审批人' AND sr.`name` = '区审批人'
) )
AND srg.tree_level = 3 AND srg.tree_level = 3