feat(dept): 添加部门子节点查询功能并优化园林模块数据权限配置

戈灵虎
1 parent 4a1a8777
Showing 5 changed files with 35 additions and 90 deletions
urbanops-module-garden/src/main/java/com/zteits/urbanops/module/garden/framework/datapermission/config/TreeDataPermissionConfiguration.java
urbanops-module-garden/src/main/java/com/zteits/urbanops/module/garden/service/tree/TreeServiceImpl.java
urbanops-module-garden/src/main/resources/mapper/tree/TreeMapper.xml
urbanops-module-system/src/main/java/com/zteits/urbanops/module/system/service/dept/DeptService.java
urbanops-module-system/src/main/java/com/zteits/urbanops/module/system/service/dept/DeptServiceImpl.java
@@ -21,4 +21,4 @@ public class TreeDataPermissionConfiguration {
         };
     }
-}
 \ No newline at end of file
+}
@@ -11,6 +11,7 @@ import com.zteits.urbanops.module.garden.dal.mysql.treechangelog.TreeChangeLogMa
 import com.zteits.urbanops.module.garden.service.road.RoadService;
 import com.zteits.urbanops.module.system.dal.dataobject.dept.DeptDO;
 import com.zteits.urbanops.module.system.dal.mysql.dept.DeptMapper;
+import com.zteits.urbanops.module.system.service.dept.DeptService;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.data.redis.core.RedisTemplate;
 import org.springframework.data.redis.core.StringRedisTemplate;
@@ -61,7 +62,7 @@ public class TreeServiceImpl implements TreeService {
     private RedisTemplate redisTemplate;
     @Resource
-    private DeptMapper deptMapper;
+    private DeptService deptService;
     public static final String CACHE_REPEAT_KEY = "gardenTree:repeat:";
@@ -178,80 +179,28 @@ public class TreeServiceImpl implements TreeService {
     @Override
     public List<CompanyDeptRoadVO> getCompanyDeptRoadTreeData(TreeVO tree) {
-//        List<DeptDO> sysDepts = deptMapper.selectList();
+        List<DeptDO> companies = deptService.getSubDeptListAll();
+
         List<CompanyDeptRoadVO> companyDeptRoadVOS = treeMapper.selectCompanyDeptRoadTreeData(tree);
+        if (!CollectionUtils.isEmpty(companyDeptRoadVOS) && !CollectionUtils.isEmpty(companies)) {
+            Map<Long, String> companyNameMap = companies.stream()
+                    .collect(Collectors.toMap(DeptDO::getId, DeptDO::getName, (a, b) -> a));
+            companyDeptRoadVOS.stream()
+                    .filter(Objects::nonNull)
+                    .forEach(vo -> {
+                        Long cid = vo.getCompanyId();
+                        if (cid == null) {
+                            return;
+                        }
+                        String name = companyNameMap.get(cid);
+                        if (StringUtils.hasText(name)) {
+                            vo.setCompanyName(name);
+                        }
+                    });
+        }
-//        // 按公司分组所有部门
-//        Map<Long, List<DeptDO>> companyDeptsMap = sysDepts.stream()
-//                .filter(d -> d.getParentId() != null)
-//                .collect(Collectors.groupingBy(DeptDO::getParentId));
-//
-//        // 过滤出叶子部门（没有子部门的部门）
-//        Map<Long, List<DeptDO>> companyLeafDeptsMap = new HashMap<>();
-//        for (Map.Entry<Long, List<DeptDO>> entry : companyDeptsMap.entrySet()) {
-//            Long companyId = entry.getKey();
-//            List<DeptDO> depts = entry.getValue();
-//
-//            // 构建部门ID到部门的映射
-//            Map<Long, DeptDO> deptMap = depts.stream()
-//                    .collect(Collectors.toMap(DeptDO::getId, d -> d));
-//
-//            // 找出叶子部门（其parentId不在deptMap中的部门，或者其parentId为0的部门）
-//            List<DeptDO> leafDepts = depts.stream()
-//                    .filter(d -> d.getParentId() == 0 || !deptMap.containsKey(d.getParentId()))
-//                    .collect(Collectors.toList());
-//
-//            companyLeafDeptsMap.put(companyId, leafDepts);
-//        }
-//
-//        // 建立现有结果的映射: 公司ID -> CompanyDeptRoadVO
-//        Map<Long, CompanyDeptRoadVO> existingCompanyMap = companyDeptRoadVOS.stream()
-//                .collect(Collectors.toMap(
-//                        CompanyDeptRoadVO::getCompanyId,
-//                        vo -> vo,
-//                        (existing, replacement) -> existing
-//                ));
-//
-//        // 遍历所有公司，补充缺失的公司和部门
-//        for (Map.Entry<Long, List<DeptDO>> entry : companyLeafDeptsMap.entrySet()) {
-//            Long companyId = entry.getKey();
-//            List<DeptDO> depts = entry.getValue();
-//
-//            CompanyDeptRoadVO companyVO;
-//            if (!existingCompanyMap.containsKey(companyId)) {
-//                // 如果公司不存在，创建新的公司对象
-//                companyVO = new CompanyDeptRoadVO();
-//                companyVO.setCompanyId(companyId);
-//                companyVO.setCompanyName(DictFrameworkUtils.parseDictDataValue("belongCompanyId", companyId + ""));
-//                companyVO.setDepts(new ArrayList<>());
-//                companyDeptRoadVOS.add(companyVO);
-//            } else {
-//                companyVO = existingCompanyMap.get(companyId);
-//            }
-//
-//            // 建立该公司下已存在的部门映射: 部门ID -> DeptVO
-//            Map<Long, CompanyDeptRoadVO.DeptVO> existingDeptMap = companyVO.getDepts().stream()
-//                    .collect(Collectors.toMap(
-//                            deptVO -> Long.valueOf(deptVO.getDeptId()),
-//                            deptVO -> deptVO,
-//                            (existing, replacement) -> existing
-//                    ));
-//
-//            // 补充缺失的部门（仅叶子部门）
-//            for (DeptDO sysDept : depts) {
-//                Long deptId = sysDept.getId();
-//                if (!existingDeptMap.containsKey(deptId)) {
-//                    // 创建缺失的部门对象
-//                    CompanyDeptRoadVO.DeptVO missingDept = new CompanyDeptRoadVO.DeptVO();
-//                    missingDept.setDeptId(deptId);
-//                    missingDept.setDeptName(sysDept.getName());
-//                    missingDept.setRoads(new ArrayList<>());
-//                    companyVO.getDepts().add(missingDept);
-//                }
-//            }
-//        }
         return companyDeptRoadVOS;
     }
@@ -269,4 +218,4 @@ public class TreeServiceImpl implements TreeService {
         return new PageResult<>(roadTreeVOS, treePage.getTotal());
     }
-}
 \ No newline at end of file
+}
@@ -27,9 +27,7 @@
     </resultMap>
     <select id="selectCompanyDeptRoadTreeData" resultMap="CompanyDeptRoadMap">
-        SELECT
-        c.id AS companyId,
-        c.name AS companyName,
+        SELECT r.company_id AS companyId,
         d.id AS deptId,
         d.name AS deptName,
         r.id AS roadId,
@@ -38,23 +36,14 @@
         r.end_remark AS endRemark,
         COALESCE(r.tree_area, 0) AS treeCount,
         COUNT(t.id) AS recordedCount
-        FROM system_dept c
-        JOIN system_dept d ON d.parent_id = c.id AND d.status = 0
-        LEFT JOIN garden_road r ON d.id = r.dept_id
-        LEFT JOIN garden_tree t ON r.id = t.road AND t.deleted = 0
-        WHERE
-        c.status = 0 and c.parent_id = 100
-        <if test="belongCompanyId != null">
-            AND d.parent_id = #{belongCompanyId}
-        </if>
+        FROM garden_tree t
+        LEFT JOIN garden_road r ON t.road = r.id
+        LEFT JOIN system_dept d ON r.dept_id = d.id AND d.status = 0
+        WHERE r.company_id = #{belongCompanyId}
         <if test="roadName != null and roadName != ''">
             AND r.road_name LIKE CONCAT('%', #{roadName}, '%')
         </if>
-        <if test="deptId != null">
-            AND d.id = #{deptId}
-        </if>
-        GROUP BY c.id, c.name, d.id, d.name,
-        r.id, r.road_name, r.starting_remark, r.end_remark, r.tree_area
+        GROUP BY r.company_id, d.id, d.name, r.id, r.road_name, r.starting_remark, r.end_remark, r.tree_area
         ORDER BY treeCount DESC, recordedCount DESC
     </select>
 </mapper>
 \ No newline at end of file
@@ -65,6 +65,7 @@ public interface DeptService {
      * @return 部门信息数组
      */
     List<DeptDO> getSubDeptList();
+    List<DeptDO> getSubDeptListAll();
     /**
      * 筛选部门列表
@@ -206,6 +206,12 @@ public class DeptServiceImpl implements DeptService {
     }
     @Override
+    @DataPermission(enable = false)
+    public List<DeptDO> getSubDeptListAll() {
+        return deptMapper.selectList(DeptDO::getParentId, 100);
+    }
+
+    @Override
     public List<DeptDO> getDeptList(DeptListReqVO reqVO) {
         List<DeptDO> list = deptMapper.selectList(reqVO);
         list.sort(Comparator.comparing(DeptDO::getSort));