From 9e362f3ae973c3f26363796e3929d3248dca5fcd Mon Sep 17 00:00:00 2001 From: dinggang <2498628697@qq.com> Date: Mon, 15 Aug 2022 18:55:05 +0800 Subject: [PATCH] =?UTF-8?q?=E8=83=BD=E5=8A=9B=E5=B9=BF=E5=9C=BA=E5=92=8C?= =?UTF-8?q?=E8=83=BD=E5=8A=9B=E9=9B=86=E5=B8=82=E8=B5=84=E6=BA=90=E6=8E=92?= =?UTF-8?q?=E5=BA=8F=E6=8C=89=E6=8C=87=E5=AE=9A=E6=96=B9=E5=BC=8F=E6=8E=92?= =?UTF-8?q?=E5=BA=8F?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../service/impl/ResourceServiceImpl.java | 56 +++++++------ .../resources/mapper/resource/ResourceDao.xml | 79 +++++++++++-------- 2 files changed, 76 insertions(+), 59 deletions(-) diff --git a/renren-admin/src/main/java/io/renren/modules/resource/service/impl/ResourceServiceImpl.java b/renren-admin/src/main/java/io/renren/modules/resource/service/impl/ResourceServiceImpl.java index 1cf3c8c9..b9629139 100644 --- a/renren-admin/src/main/java/io/renren/modules/resource/service/impl/ResourceServiceImpl.java +++ b/renren-admin/src/main/java/io/renren/modules/resource/service/impl/ResourceServiceImpl.java @@ -43,6 +43,7 @@ import io.renren.modules.resourceMountApply.service.TResourceMountApplyService; import io.renren.modules.resourceScore.dao.ResourceScoreDao; import io.renren.modules.security.user.SecurityUser; import io.renren.modules.sys.dao.SysDeptDao; +import io.renren.modules.sys.dao.SysRegionDao; import io.renren.modules.sys.dto.SysUserDTO; import io.renren.modules.sys.service.SysDeptService; import io.renren.modules.sys.service.SysUserService; @@ -180,6 +181,9 @@ public class ResourceServiceImpl extends CrudServiceImpl>> listMap = typeMapList.stream().collect(Collectors.groupingBy(m -> m.get("type").toString())); //区级要根据行政区划多加一层结构 - List tasks = listMap.entrySet().stream().filter(index -> !"区级".equals(index.getKey())).map(item -> { - CompletableFuture task = CompletableFuture.runAsync(() -> { - HashMap map = new HashMap<>(); - map.put("type", item.getKey()); - Integer integer = resourceDao.selectTypeCountByDept(item.getKey(), jsonObject.getString("type")); - map.put("total", integer); - item.getValue().forEach(item1 -> item1.remove("type")); - map.put("dataList", item.getValue()); - if (integer != 0) { - resultList.add(map); - } - }, executor); - return task; - }).collect(Collectors.toList()); + List tasks = + listMap.entrySet().stream().filter(index -> !"区级".equals(index.getKey())).map(item -> { + CompletableFuture task = CompletableFuture.runAsync(() -> { + HashMap map = new HashMap<>(); + map.put("type", item.getKey()); + Integer integer = resourceDao.selectTypeCountByDept(item.getKey(), jsonObject.getString("type")); + map.put("total", integer); + item.getValue().forEach(item1 -> { + item1.remove("type"); + item1.remove("regionSort"); + }); + map.put("dataList", item.getValue()); + if (integer != 0) { + resultList.add(map); + } + }, executor); + return task; + }).collect(Collectors.toList()); CompletableFuture.allOf(tasks.toArray(new CompletableFuture[tasks.size()])).join(); Optional>> areaList = Optional.ofNullable(listMap.get("区级")); @@ -820,12 +822,14 @@ public class ResourceServiceImpl extends CrudServiceImpl item1.remove("type")); map.put("dataList", value); + map.put("regionSort", value.get(0).get("regionSort")); areaListTemp.add(map); }, executor); tasksArea.add(task); }); CompletableFuture.allOf(tasksArea.toArray(new CompletableFuture[tasksArea.size()])).join(); - areaMap.put("dataList", areaListTemp); + List collect = areaListTemp.stream().sorted(Comparator.comparingInt(m -> Integer.parseInt(m.get("regionSort").toString()))).collect(Collectors.toList()); + areaMap.put("dataList", collect); if (integer != 0) { resultList.add(areaMap); } @@ -1057,7 +1061,7 @@ public class ResourceServiceImpl extends CrudServiceImpl selectDTOPageSpecilTotal(ResourceDTO resourceDTO) { return resourceDao.selectDTOPageSpecilTotal(resourceDTO); } @@ -1065,7 +1069,8 @@ public class ResourceServiceImpl extends CrudServiceImpl queryWrapper = new QueryWrapper<>(); - queryWrapper.eq("instance_id", instanceId).eq("approve_status", "通过"); + queryWrapper.eq("instance_id", instanceId) + .eq("approve_status", "通过"); List applicationEntities = tAbilityApplicationDao.selectList(queryWrapper); ArrayList cameraList = new ArrayList(); applicationEntities.forEach(index -> { @@ -1849,7 +1854,8 @@ public class ResourceServiceImpl extends CrudServiceImpl @@ -192,7 +198,7 @@ ORDER BY ${orderField} ${orderType}, pin_top_time DESC - ORDER BY sd.type, sd.sort + ORDER BY sd.type, sr.sort, sd.sort, tdr.dept_id, tdr.visitor DESC, tdr.id DESC ORDER BY ${orderField} ${orderType} @@ -308,8 +314,6 @@ tdr.undercarriage_reason, tdr.undercarriage_user_name, tdr.info_list, - tdr.pin_top, - tdr.pin_top_time, IFNULL( trs.score, 0 ) AS "score", IFNULL( taa.applyCount, 0 ) AS "applyCount", IFNULL( trc.collectCount, 0 ) AS "collectCount", @@ -389,10 +393,14 @@ tdr.total AS total, tdr.pin_top, tdr.pin_top_time, + tdr.visitor, IFNULL(trs.score, 0 ) AS "score", IFNULL(taa.applyCount, 0 ) AS "applyCount", IFNULL(trc.collectCount, 0) AS "collectCount", sd.name AS "deptName", + sd.type AS "deptType", + sd.sort AS "deptSort", + sr.sort AS "regionSort", IFNULL(trc2.isCollect, 'false') AS "isCollect", IFNULL(taa2.approve_status, '未申请') AS "applyState", IF ( IFNULL( trcar.car, 0 ) > 0, TRUE, FALSE ) AS "isInShoppingCart", @@ -415,10 +423,10 @@ AND user_id = #{dto.creator} GROUP BY id) taa2 ON tdr.id = taa2.resource_id LEFT JOIN ( SELECT resource_id, COUNT( approve_status ) approve_status FROM t_ability_application WHERE 1 = 1 - AND del_flag = 0 AND user_id = #{dto.creator} AND approve_status = '通过' GROUP BY resource_id ) taa3 ON tdr.id - = + AND del_flag = 0 AND user_id = #{dto.creator} AND approve_status = '通过' GROUP BY resource_id ) taa3 ON tdr.id = taa3.resource_id LEFT JOIN sys_dept sd ON tdr.dept_id = sd.id + LEFT JOIN sys_region sr ON sd.district = sr.id WHERE 1 = 1 AND tdr.del_flag = 0 @@ -465,7 +473,7 @@ ORDER BY ${orderField} ${orderType}, pin_top_time DESC - ORDER BY sd.type, sd.sort + ORDER BY sd.type, sr.sort, sd.sort, tdr.dept_id, tdr.visitor DESC, tdr.id DESC ORDER BY ${orderField} ${orderType} @@ -599,13 +607,13 @@ FROM ( SELECT - ( CASE sd.type WHEN 1 THEN '省级' WHEN 2 THEN '市级' WHEN 3 THEN '区级' WHEN 4 THEN '企业' ELSE '其他' END ) AS - "type", + ( CASE sd.type WHEN 1 THEN '省级' WHEN 2 THEN '市级' WHEN 3 THEN '区级' WHEN 4 THEN '企业' ELSE '其他' END ) AS "type", sd.NAME AS "deptName", IFNULL( tdr.deptCount, 0 ) AS "deptCount", sd.id AS "deptId", sr.name AS "districtName", - sr.id AS "districtId" + sr.id AS "districtId", + sr.sort AS "regionSort" FROM sys_dept sd LEFT JOIN ( SELECT dept_id, COUNT( id ) AS "deptCount" FROM tb_data_resource WHERE 1 = 1 AND del_flag = 0 @@ -614,7 +622,7 @@ GROUP BY dept_id ) tdr ON sd.id = tdr.dept_id LEFT JOIN sys_region sr ON sd.district = sr.id - ORDER BY sd.type, sr.sort, sd.sort + ORDER BY sd.type, sd.sort ) temp1 WHERE 1 = 1 @@ -633,8 +641,7 @@ FROM ( SELECT - ( CASE sd.type WHEN 1 THEN '省级' WHEN 2 THEN '市级' WHEN 3 THEN '区级' WHEN 4 THEN '企业' ELSE '其他' END ) AS - "type", + ( CASE sd.type WHEN 1 THEN '省级' WHEN 2 THEN '市级' WHEN 3 THEN '区级' WHEN 4 THEN '企业' ELSE '其他' END ) AS "type", IFNULL( tdr.deptCount, 0 ) AS "deptCount" FROM sys_dept sd @@ -672,8 +679,7 @@ FROM ( SELECT - ( CASE sd.type WHEN 1 THEN '省级' WHEN 2 THEN '市级' WHEN 3 THEN '区级' WHEN 4 THEN '企业' ELSE '其他' END ) AS - "type", + ( CASE sd.type WHEN 1 THEN '省级' WHEN 2 THEN '市级' WHEN 3 THEN '区级' WHEN 4 THEN '企业' ELSE '其他' END ) AS "type", IFNULL( tdr.deptCount, 0) AS "deptCount", IFNULL(sr.name, '暂无该地区') AS "districtName" FROM @@ -1503,7 +1509,7 @@