liusheng
2025-04-11 013450af0b071d504c9b1c6cf7d1c58639e3cf32
代码提交
已修改10个文件
312 ■■■■■ 文件已修改
ruoyi-admin/src/main/resources/application-druid.yml 16 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
ruoyi-admin/src/main/resources/logback.xml 4 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
smartor/src/main/java/com/smartor/service/impl/HeLibraryAssortServiceImpl.java 41 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
smartor/src/main/java/com/smartor/service/impl/IvrLibaScriptAssortServiceImpl.java 38 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
smartor/src/main/java/com/smartor/service/impl/IvrLibaTargetAssortServiceImpl.java 42 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
smartor/src/main/java/com/smartor/service/impl/IvrLibaTemplateAssortServiceImpl.java 38 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
smartor/src/main/java/com/smartor/service/impl/ServiceExternalServiceImpl.java 7 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
smartor/src/main/java/com/smartor/service/impl/SvyCategoryServiceImpl.java 37 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
smartor/src/main/java/com/smartor/service/impl/SvyLibScriptCategoryServiceImpl.java 51 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
smartor/src/main/java/com/smartor/service/impl/SvyLibTemplateCategoryServiceImpl.java 38 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
ruoyi-admin/src/main/resources/application-druid.yml
@@ -13,10 +13,10 @@
        #        公司
        #        url: jdbc:mysql://192.168.2.9:3308/smartor?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B8
        #        丽水
        url: jdbc:mysql://127.0.0.1:3308/smartor-lisui?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B8
        username: smartor
        password: Smartor.2023
        driverClassName: com.mysql.cj.jdbc.Driver
#        url: jdbc:mysql://127.0.0.1:3308/smartor-lisui?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B8
#        username: smartor
#        password: Smartor.2023
#        driverClassName: com.mysql.cj.jdbc.Driver
        #        # 新华
        #        url: jdbc:mysql://192.168.191.181:3308/smartor?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B8
        #        username: smartor
@@ -24,10 +24,10 @@
        #        driverClassName: com.mysql.cj.jdbc.Driver
        #  公司云
#        url: jdbc:mysql://116.62.18.175:6002/smartor_lisui?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B8
#        username: hxsoft
#        password: Hxerp2000
#        driverClassName: com.mysql.cj.jdbc.Driver
        url: jdbc:mysql://116.62.18.175:6002/smartor_lisui?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B8
        username: hxsoft
        password: Hxerp2000
        driverClassName: com.mysql.cj.jdbc.Driver
      # 从库数据源
ruoyi-admin/src/main/resources/logback.xml
@@ -1,6 +1,8 @@
<?xml version="1.0" encoding="UTF-8"?>
<configuration>
    <!-- 日志存放路径 -->
    <!-- 日志存放路径 8095-->
<!--    <property name="log.path" value="D:/health/logs" />-->
    <!-- 日志存放路径 8096-->
    <property name="log.path" value="D:/lihu/logs" />
    <!-- 丽水日志存放路径 -->
<!--    <property name="log.path" value="/home/software/smartor-logs" />-->
smartor/src/main/java/com/smartor/service/impl/HeLibraryAssortServiceImpl.java
@@ -49,31 +49,30 @@
    @Override
    public List<HeLibraryAssortVO> selectHeLibraryAssortList(HeLibraryAssort heLibraryAssort) {
        List<HeLibraryAssort> heLibraryAssorts = heLibraryAssortMapper.selectHeLibraryAssortList(heLibraryAssort);
        //将pid为空的,过滤掉
        List<HeLibraryAssort> heLibraryAssortList2 = new ArrayList<>();
        for (HeLibraryAssort heLibraryAssort1 : heLibraryAssorts) {
//            if (heLibraryAssort1.getPid() != null) {
                heLibraryAssortList2.add(heLibraryAssort1);
//            }
        List<HeLibraryAssortVO> heLibraryAssortVOS = DtoConversionUtils.sourceToTarget(heLibraryAssorts, HeLibraryAssortVO.class);
        List<HeLibraryAssortVO> rootList = new ArrayList<>();
        Map<Long, HeLibraryAssortVO> categoryMap = new HashMap<>();
        // 建立id->对象的映射
        for (HeLibraryAssortVO category : heLibraryAssortVOS) {
            categoryMap.put(category.getId(), category);
        }
        List<HeLibraryAssortVO> heLibraryAssortVOS = DtoConversionUtils.sourceToTarget(heLibraryAssortList2, HeLibraryAssortVO.class);
        //遍历查出来的数据,通过 id=pid 获取他们的子数据
        List<HeLibraryAssortVO> heLibraryAssortVOArrayList = new ArrayList<>();
        for (HeLibraryAssortVO heLibraryAssortVO : heLibraryAssortVOS) {
//            if (heLibraryAssortVO.getPid() != null) {
//                continue;
//            }
            HeLibraryAssort heLibraryAssort1 = new HeLibraryAssort();
            heLibraryAssort1.setPid(heLibraryAssortVO.getId());
            List<HeLibraryAssort> heLibraryAssortList = heLibraryAssortMapper.selectHeLibraryAssortList(heLibraryAssort1);
            if (!Collections.isEmpty(heLibraryAssortList)) {
                heLibraryAssortVO.setHeLibraryAssortList(heLibraryAssortList);
        for (HeLibraryAssortVO category : heLibraryAssortVOS) {
            if (category.getPid() == null || category.getPid() == -1) {
                // 顶层节点
                rootList.add(category);
            } else {
                // 找到父节点,并添加到其子节点列表
                HeLibraryAssortVO parent = categoryMap.get(category.getPid());
                if (parent != null) {
                    HeLibraryAssort sc = DtoConversionUtils.sourceToTarget(category, HeLibraryAssort.class);
                    parent.getHeLibraryAssortList().add(sc);
                }
            }
            heLibraryAssortVOArrayList.add(heLibraryAssortVO);
        }
        return heLibraryAssortVOArrayList;
        return rootList;
    }
    /**
smartor/src/main/java/com/smartor/service/impl/IvrLibaScriptAssortServiceImpl.java
@@ -13,7 +13,10 @@
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
import java.util.ArrayList;
import java.util.HashMap;
import java.util.List;
import java.util.Map;
import java.util.stream.Collectors;
/**
@@ -178,22 +181,29 @@
    @Override
    public List<IvrLibaScriptAssortVO> selectIvrLibaScriptAssortList(IvrLibaScriptAssort ivrLibaScriptAssort) {
        List<IvrLibaScriptAssort> ivrLibaScriptAssorts = ivrLibaScriptAssortMapper.selectIvrLibaScriptAssortList(ivrLibaScriptAssort);
        //将pid为空的,过滤掉
//        ivrLibaScriptAssorts = ivrLibaScriptAssorts.stream().filter(assort -> assort.getPid() == null).collect(Collectors.toList());
        List<IvrLibaScriptAssortVO> ivrLibaScriptAssortVOS = DtoConversionUtils.sourceToTarget(ivrLibaScriptAssorts, IvrLibaScriptAssortVO.class);
        //遍历查出来的数据,通过 id=pid 获取他们的子数据
        for (IvrLibaScriptAssortVO ivrLibaScriptAssortVO : ivrLibaScriptAssortVOS) {
//            if (ivrLibaScriptAssortVO.getPid() != null) {
//                continue;
//            }
            IvrLibaScriptAssort ivrLibaTargetAssort1 = new IvrLibaScriptAssort();
            ivrLibaTargetAssort1.setPid(ivrLibaScriptAssortVO.getId());
            List<IvrLibaScriptAssort> ivrLibaScriptAssorts1 = ivrLibaScriptAssortMapper.selectIvrLibaScriptAssortList(ivrLibaTargetAssort1);
            if (!Collections.isEmpty(ivrLibaScriptAssorts1)) {
                ivrLibaScriptAssortVO.setIvrLibaScriptAssortList(ivrLibaScriptAssorts1);
        List<IvrLibaScriptAssortVO> rootList = new ArrayList<>();
        Map<Long, IvrLibaScriptAssortVO> categoryMap = new HashMap<>();
        // 建立id->对象的映射
        for (IvrLibaScriptAssortVO category : ivrLibaScriptAssortVOS) {
            categoryMap.put(category.getId(), category);
        }
        for (IvrLibaScriptAssortVO category : ivrLibaScriptAssortVOS) {
            if (category.getPid() == null || category.getPid() == -1) {
                // 顶层节点
                rootList.add(category);
            } else {
                // 找到父节点,并添加到其子节点列表
                IvrLibaScriptAssortVO parent = categoryMap.get(category.getPid());
                if (parent != null) {
                    IvrLibaScriptAssort sc = DtoConversionUtils.sourceToTarget(category, IvrLibaScriptAssort.class);
                    parent.getIvrLibaScriptAssortList().add(sc);
                }
            }
        }
        return ivrLibaScriptAssortVOS;
        return rootList;
    }
}
smartor/src/main/java/com/smartor/service/impl/IvrLibaTargetAssortServiceImpl.java
@@ -14,7 +14,9 @@
import org.springframework.stereotype.Service;
import java.util.ArrayList;
import java.util.HashMap;
import java.util.List;
import java.util.Map;
import java.util.stream.Collectors;
/**
@@ -49,30 +51,30 @@
    @Override
    public List<IvrLibaTargetAssortVO> selectIvrLibaTargetAssortList(IvrLibaTargetAssort ivrLibaTargetAssort) {
        List<IvrLibaTargetAssort> ivrLibaTargetAssorts = ivrLibaTargetAssortMapper.selectIvrLibaTargetAssortList(ivrLibaTargetAssort);
        //将pid为空的,过滤掉
        List<IvrLibaTargetAssort> ivrLibaTargetAssortList = new ArrayList<>();
        for (IvrLibaTargetAssort ivrLibaTargetAssort1 : ivrLibaTargetAssorts) {
//            if (ivrLibaTargetAssort1.getPid() != null) {
                ivrLibaTargetAssortList.add(ivrLibaTargetAssort1);
//            }
        List<IvrLibaTargetAssortVO> ivrLibaTargetAssortVOS = DtoConversionUtils.sourceToTarget(ivrLibaTargetAssorts, IvrLibaTargetAssortVO.class);
        List<IvrLibaTargetAssortVO> rootList = new ArrayList<>();
        Map<Long, IvrLibaTargetAssortVO> categoryMap = new HashMap<>();
        // 建立id->对象的映射
        for (IvrLibaTargetAssortVO category : ivrLibaTargetAssortVOS) {
            categoryMap.put(category.getId(), category);
        }
        List<IvrLibaTargetAssortVO> ivrLibaTargetAssortVOS = DtoConversionUtils.sourceToTarget(ivrLibaTargetAssortList, IvrLibaTargetAssortVO.class);
        //遍历查出来的数据,通过 id=pid 获取他们的子数据
        List<IvrLibaTargetAssortVO> ivrLibaTargetAssortVOS1 = new ArrayList<>();
        for (IvrLibaTargetAssortVO ivrLibaTargetAssortVO : ivrLibaTargetAssortVOS) {
//            if (ivrLibaTargetAssortVO.getPid() != -1) {
//                continue;
//            }
            IvrLibaTargetAssort ivrLibaTargetAssort1 = new IvrLibaTargetAssort();
            ivrLibaTargetAssort1.setPid(ivrLibaTargetAssortVO.getId());
            List<IvrLibaTargetAssort> ivrLibaTargetAssorts2 = ivrLibaTargetAssortMapper.selectIvrLibaTargetAssortList(ivrLibaTargetAssort1);
            if (!Collections.isEmpty(ivrLibaTargetAssorts2)) {
                ivrLibaTargetAssortVO.setIvrLibaTargetAssortList(ivrLibaTargetAssorts2);
        for (IvrLibaTargetAssortVO category : ivrLibaTargetAssortVOS) {
            if (category.getPid() == null || category.getPid() == -1) {
                // 顶层节点
                rootList.add(category);
            } else {
                // 找到父节点,并添加到其子节点列表
                IvrLibaTargetAssortVO parent = categoryMap.get(category.getPid());
                if (parent != null) {
                    IvrLibaTargetAssort sc = DtoConversionUtils.sourceToTarget(category, IvrLibaTargetAssort.class);
                    parent.getIvrLibaTargetAssortList().add(sc);
                }
            }
            ivrLibaTargetAssortVOS1.add(ivrLibaTargetAssortVO);
        }
        return ivrLibaTargetAssortVOS1;
        return rootList;
    }
    /**
smartor/src/main/java/com/smartor/service/impl/IvrLibaTemplateAssortServiceImpl.java
@@ -14,7 +14,10 @@
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
import java.util.ArrayList;
import java.util.HashMap;
import java.util.List;
import java.util.Map;
import java.util.stream.Collectors;
/**
@@ -49,23 +52,30 @@
    @Override
    public List<IvrLibaTemplateAssortVO> selectIvrLibaTemplateAssortList(IvrLibaTemplateAssort ivrLibaScriptAssort) {
        List<IvrLibaTemplateAssort> ivrLibaTemplateAssorts = ivrLibaTemplateAssortMapper.selectIvrLibaTemplateAssortList(ivrLibaScriptAssort);
        //将pid为空的,过滤掉
//        ivrLibaTemplateAssorts = ivrLibaTemplateAssorts.stream().filter(assort -> assort.getPid() == null).collect(Collectors.toList());
        List<IvrLibaTemplateAssortVO> ivrLibaTemplateAssortVOS = DtoConversionUtils.sourceToTarget(ivrLibaTemplateAssorts, IvrLibaTemplateAssortVO.class);
        //遍历查出来的数据,通过 id=pid 获取他们的子数据
        for (IvrLibaTemplateAssortVO ivrLibaTemplateAssortVO : ivrLibaTemplateAssortVOS) {
//            if (ivrLibaTemplateAssortVO.getPid() != null) {
//                continue;
//            }
            IvrLibaTemplateAssort ivrLibaTemplateAssort = new IvrLibaTemplateAssort();
            ivrLibaTemplateAssort.setPid(ivrLibaTemplateAssortVO.getId());
            List<IvrLibaTemplateAssort> ivrLibaTemplateAssorts1 = ivrLibaTemplateAssortMapper.selectIvrLibaTemplateAssortList(ivrLibaTemplateAssort);
            if (!Collections.isEmpty(ivrLibaTemplateAssorts1)) {
                ivrLibaTemplateAssortVO.setIvrLibaTemplateAssortList(ivrLibaTemplateAssorts1);
        List<IvrLibaTemplateAssortVO> rootList = new ArrayList<>();
        Map<Long, IvrLibaTemplateAssortVO> categoryMap = new HashMap<>();
        // 建立id->对象的映射
        for (IvrLibaTemplateAssortVO category : ivrLibaTemplateAssortVOS) {
            categoryMap.put(category.getId(), category);
        }
        for (IvrLibaTemplateAssortVO category : ivrLibaTemplateAssortVOS) {
            if (category.getPid() == null || category.getPid() == -1) {
                // 顶层节点
                rootList.add(category);
            } else {
                // 找到父节点,并添加到其子节点列表
                IvrLibaTemplateAssortVO parent = categoryMap.get(category.getPid());
                if (parent != null) {
                    IvrLibaTemplateAssort sc = DtoConversionUtils.sourceToTarget(category, IvrLibaTemplateAssort.class);
                    parent.getIvrLibaTemplateAssortList().add(sc);
                }
            }
        }
        return ivrLibaTemplateAssortVOS;
        return rootList;
    }
    /**
smartor/src/main/java/com/smartor/service/impl/ServiceExternalServiceImpl.java
@@ -871,12 +871,10 @@
        }
        patArchive.setTelcode(externalInHospPatientInfo.getLianXiDH());
        if (StringUtils.isEmpty(externalInHospPatientInfo.getLianXiDH()))
        if (StringUtils.isEmpty(patArchive.getTelcode()))
            patArchive.setTelcode(externalInHospPatientInfo.getLianXiRDH());
        patArchive.setRelativetelcode(externalInHospPatientInfo.getLianXiRDH());
        patArchive.setGuid(externalInHospPatientInfo.getZuZhiJGID());
        if (ObjectUtils.isNotEmpty(externalInHospPatientLiaisonInfo))
            patArchive.setRelativetelcode(externalInHospPatientLiaisonInfo.getLianXiRDH());
        patArchive.setInhospno(externalInHospPatientInfo.getBingAnHao());
        patArchive.setIdcardtype(externalInHospPatientInfo.getZhengJianLXMC());
        patArchive.setUpdateTime(new Date());
@@ -968,6 +966,7 @@
        int i = 1;
        if (CollectionUtils.isNotEmpty(patMedInhospList)) {
            patMedInhosp.setUpdateTime(new Date());
            patMedInhosp.setInhospid(patMedInhospList.get(0).getInhospid());
            i = patMedInhospMapper.updatePatMedInhosp(patMedInhosp);
        } else {
            patMedInhosp.setCreateTime(new Date());
@@ -1103,7 +1102,7 @@
                return addMedicalTeam(dataMap);
            case "JZ_ZY_RuKe":
                log.error("入科的数据为:{}", type);
                return addMedicalTeam(dataMap);
                return addInDeptInfo(dataMap);
        }
        return true;
    }
smartor/src/main/java/com/smartor/service/impl/SvyCategoryServiceImpl.java
@@ -16,7 +16,10 @@
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
import java.util.ArrayList;
import java.util.HashMap;
import java.util.List;
import java.util.Map;
import java.util.stream.Collectors;
/**
@@ -51,23 +54,31 @@
    @Override
    public List<SvyCategoryVO> selectSvyCategoryList(SvyCategory svyCategory) {
        List<SvyCategory> svyCategories = svyCategoryMapper.selectSvyCategoryList(svyCategory);
        //将pid为空的,过滤掉
//        svyCategories = svyCategories.stream().filter(assort -> assort.getPid() == null).collect(Collectors.toList());
        List<SvyCategoryVO> svyCategoryVOS = DtoConversionUtils.sourceToTarget(svyCategories, SvyCategoryVO.class);
        //遍历查出来的数据,通过 id=pid 获取他们的子数据
        for (SvyCategoryVO svyCategoryVO : svyCategoryVOS) {
//            if (svyCategoryVO.getPid() != null) {
//                continue;
//            }
            SvyCategory svyCategory1 = new SvyCategory();
            svyCategory1.setPid(svyCategoryVO.getId());
            List<SvyCategory> svyCategoryList = svyCategoryMapper.selectSvyCategoryList(svyCategory1);
            if (!Collections.isEmpty(svyCategoryList)) {
                svyCategoryVO.setSvyCategoryList(svyCategoryList);
        List<SvyCategoryVO> rootList = new ArrayList<>();
        Map<Long, SvyCategoryVO> categoryMap = new HashMap<>();
        // 建立id->对象的映射
        for (SvyCategoryVO category : svyCategoryVOS) {
            categoryMap.put(category.getId(), category);
        }
        for (SvyCategoryVO category : svyCategoryVOS) {
            if (category.getPid() == null || category.getPid() == -1) {
                // 顶层节点
                rootList.add(category);
            } else {
                // 找到父节点,并添加到其子节点列表
                SvyCategoryVO parent = categoryMap.get(category.getPid());
                if (parent != null) {
                    SvyCategory sc = DtoConversionUtils.sourceToTarget(category, SvyCategory.class);
                    parent.getSvyCategoryList().add(sc);
                }
            }
        }
        return svyCategoryVOS;
        return rootList;
    }
    /**
smartor/src/main/java/com/smartor/service/impl/SvyLibScriptCategoryServiceImpl.java
@@ -15,9 +15,7 @@
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
import java.util.ArrayList;
import java.util.Date;
import java.util.List;
import java.util.*;
import java.util.stream.Collectors;
/**
@@ -52,23 +50,46 @@
    @Override
    public List<SvyLibScriptCategoryVO> selectSvyLibScriptCategoryList(SvyLibScriptCategory svyLibScriptCategory) {
        List<SvyLibScriptCategory> svyLibScriptCategories = svyLibScriptCategoryMapper.selectSvyLibScriptCategoryList(svyLibScriptCategory);
//        //将pid为空的,过滤掉
//        svyLibScriptCategories = svyLibScriptCategories.stream().filter(assort -> assort.getPid() != null).collect(Collectors.toList());
        List<SvyLibScriptCategoryVO> SvyLibScriptCategoryVO = DtoConversionUtils.sourceToTarget(svyLibScriptCategories, SvyLibScriptCategoryVO.class);
        //遍历查出来的数据,通过 id=pid 获取他们的子数据
        for (SvyLibScriptCategoryVO svyLibScriptCategoryVO : SvyLibScriptCategoryVO) {
////        //将pid为空的,过滤掉
//        svyLibScriptCategories = svyLibScriptCategories.stream().filter(assort -> assort.getPid() == null).collect(Collectors.toList());
//
//        List<SvyLibScriptCategoryVO> SvyLibScriptCategoryVO = DtoConversionUtils.sourceToTarget(svyLibScriptCategories, SvyLibScriptCategoryVO.class);
//        //遍历查出来的数据,通过 id=pid 获取他们的子数据
//        for (SvyLibScriptCategoryVO svyLibScriptCategoryVO : SvyLibScriptCategoryVO) {
//            if (svyLibScriptCategoryVO.getPid() != null) {
//                continue;
//            }
            SvyLibScriptCategory svyLibScriptCategory1 = new SvyLibScriptCategory();
            svyLibScriptCategory1.setPid(svyLibScriptCategoryVO.getId());
            List<SvyLibScriptCategory> svyLibScriptCategories1 = svyLibScriptCategoryMapper.selectSvyLibScriptCategoryList(svyLibScriptCategory1);
            if (!Collections.isEmpty(svyLibScriptCategories1)) {
                svyLibScriptCategoryVO.setSvyLibScriptCategoryList(svyLibScriptCategories1);
//            SvyLibScriptCategory svyLibScriptCategory1 = new SvyLibScriptCategory();
//            svyLibScriptCategory1.setPid(svyLibScriptCategoryVO.getId());
//            List<SvyLibScriptCategory> svyLibScriptCategories1 = svyLibScriptCategoryMapper.selectSvyLibScriptCategoryList(svyLibScriptCategory1);
//            if (!Collections.isEmpty(svyLibScriptCategories1)) {
//                svyLibScriptCategoryVO.setSvyLibScriptCategoryList(svyLibScriptCategories1);
//            }
//        }
  List<SvyLibScriptCategoryVO> svyLibScriptCategoryVOS = DtoConversionUtils.sourceToTarget(svyLibScriptCategories, SvyLibScriptCategoryVO.class);
        List<SvyLibScriptCategoryVO> rootList = new ArrayList<>();
        Map<Long, SvyLibScriptCategoryVO> categoryMap = new HashMap<>();
        // 建立id->对象的映射
        for (SvyLibScriptCategoryVO category : svyLibScriptCategoryVOS) {
            categoryMap.put(category.getId(), category);
        }
            for (SvyLibScriptCategoryVO category : svyLibScriptCategoryVOS) {
            if (category.getPid() == null || category.getPid() == -1) {
                // 顶层节点
                rootList.add(category);
            } else {
                // 找到父节点,并添加到其子节点列表
                SvyLibScriptCategoryVO parent = categoryMap.get(category.getPid());
                if (parent != null) {
                    SvyLibScriptCategory sc = DtoConversionUtils.sourceToTarget(category, SvyLibScriptCategory.class);
                    parent.getSvyLibScriptCategoryList().add(sc);
                }
            }
        }
        return SvyLibScriptCategoryVO;
        return rootList;
    }
    /**
smartor/src/main/java/com/smartor/service/impl/SvyLibTemplateCategoryServiceImpl.java
@@ -14,7 +14,10 @@
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
import java.util.ArrayList;
import java.util.HashMap;
import java.util.List;
import java.util.Map;
import java.util.stream.Collectors;
/**
@@ -49,23 +52,30 @@
    @Override
    public List<SvyLibTemplateCategoryVO> selectSvyLibTemplateCategoryList(SvyLibTemplateCategory svyLibTemplateCategory) {
        List<SvyLibTemplateCategory> svyLibTemplateCategories = svyLibTemplateCategoryMapper.selectSvyLibTemplateCategoryList(svyLibTemplateCategory);
        //将pid为空的,过滤掉
//        svyLibTemplateCategories = svyLibTemplateCategories.stream().filter(assort -> assort.getPid() == null).collect(Collectors.toList());
        List<SvyLibTemplateCategoryVO> svyLibTemplateCategoryVOList = DtoConversionUtils.sourceToTarget(svyLibTemplateCategories, SvyLibTemplateCategoryVO.class);
        //遍历查出来的数据,通过 id=pid 获取他们的子数据
        for (SvyLibTemplateCategoryVO svyLibTemplateCategoryVO : svyLibTemplateCategoryVOList) {
//            if (svyLibTemplateCategoryVO.getPid() != null) {
//                continue;
//            }
            SvyLibTemplateCategory svyLibTemplateCategory1 = new SvyLibTemplateCategory();
            svyLibTemplateCategory1.setPid(svyLibTemplateCategoryVO.getId());
            List<SvyLibTemplateCategory> svyLibTemplateCategoryList = svyLibTemplateCategoryMapper.selectSvyLibTemplateCategoryList(svyLibTemplateCategory1);
            if (!Collections.isEmpty(svyLibTemplateCategoryList)) {
                svyLibTemplateCategoryVO.setSvyLibTemplateCategoryList(svyLibTemplateCategoryList);
        List<SvyLibTemplateCategoryVO> rootList = new ArrayList<>();
        Map<Long, SvyLibTemplateCategoryVO> categoryMap = new HashMap<>();
        // 建立id->对象的映射
        for (SvyLibTemplateCategoryVO category : svyLibTemplateCategoryVOList) {
            categoryMap.put(category.getId(), category);
        }
        for (SvyLibTemplateCategoryVO category : svyLibTemplateCategoryVOList) {
            if (category.getPid() == null || category.getPid() == -1) {
                // 顶层节点
                rootList.add(category);
            } else {
                // 找到父节点,并添加到其子节点列表
                SvyLibTemplateCategoryVO parent = categoryMap.get(category.getPid());
                if (parent != null) {
                    SvyLibTemplateCategory sc = DtoConversionUtils.sourceToTarget(category, SvyLibTemplateCategory.class);
                    parent.getSvyLibTemplateCategoryList().add(sc);
                }
            }
        }
        return svyLibTemplateCategoryVOList;
        return rootList;
    }
    /**