Merge branch 'server-165' of uskycloud/usky-modules into master

service-backend/service-backend-api/src/main/java/com/usky/backend/domain/BaseAlarmVO.java

@@ -0,0 +1,13 @@
+package com.usky.backend.domain;
+
+import lombok.Data;
+
+import java.io.Serializable;
+
+@Data
+public class BaseAlarmVO implements Serializable {
+
+    private String alarmTime;
+
+    private String alarmContent;
+}

service-backend/service-backend-api/src/main/java/com/usky/backend/domain/DataTVResponseVO.java

@@ -21,4 +21,6 @@ public class DataTVResponseVO implements Serializable {
     private Integer alarmStatus;
     //设备属性集合
     private List<DeviceAttributeVO> dp;
+    //告警信息集合
+    private List<BaseAlarmVO> alarmList;
 }

service-fire/service-fire-biz/src/main/java/com/usky/fire/controller/web/TaskController.java

@@ -73,7 +73,7 @@ public class TaskController {
         demReportDataService.regularReportData();
     }
 
-    @Scheduled(cron = "0 0 23 * * ? ")////每天23点
+    @Scheduled(cron = "0 0 23 * * ? ")//每天23点
     public void task5(){
         System.out.println(Thread.currentThread().getName() + "巡检计划分批次创建执行中");
         patrolInspectionPlanService.addPatrolInspectionPlanSon();

service-fire/service-fire-biz/src/main/java/com/usky/fire/service/impl/PatrolInspectionPlanServiceImpl.java

@@ -507,11 +507,24 @@ public class PatrolInspectionPlanServiceImpl extends AbstractCrudService<PatrolI
                 throw new BusinessException("无主计划地点关联信息");
             }
 
+            //分配创建巡检计划之前先判断数据库中是否已经存在这条计划记录
+            LocalDate inspectionDate = OnlineMethod.getDate(LocalDate.now().format(DateTimeFormatter.ofPattern("yyyy-MM-dd")), "yyyy-MM-dd", true, 7);
+            LambdaQueryWrapper<PatrolInspectionPlanSon> queryWrapper3 = Wrappers.lambdaQuery();
+            queryWrapper3.select(PatrolInspectionPlanSon::getPlanId)
+                    .eq(PatrolInspectionPlanSon::getInspectionDate,inspectionDate);
+            List<PatrolInspectionPlanSon> planSonList = patrolInspectionPlanSonService.list(queryWrapper3);
+            List<Integer> planSonPlanIdList = new ArrayList<>();
+            if(CollectionUtils.isNotEmpty(planSonList)){
+                for (int i = 0; i < planSonList.size(); i++) {
+                    planSonPlanIdList.add(planSonList.get(i).getPlanId());
+                }
+            }
+
             for (int m = 0; m < list.size(); m++) {
                 //子表数据添加
                 if (list.get(m).getPlanType() == 1) {//普通计划 当前日期+7天在巡检计划时间范围内，就创建一条当前日期+7天日期对应的巡检记录
                     for (int j = 0; j < scheduleList.size(); j++) {
-                        if(list.get(m).getId().equals(scheduleList.get(j).getPlanId())){
+                        if((list.get(m).getId().equals(scheduleList.get(j).getPlanId())) && (!planSonPlanIdList.contains(list.get(m).getId()))){
                             LocalDate s = OnlineMethod.getDate(LocalDate.now().format(DateTimeFormatter.ofPattern("yyyy-MM-dd")), "yyyy-MM-dd", true, 7);
                             Date date = Date.from(s.atStartOfDay(ZoneOffset.ofHours(8)).toInstant());
                             String week = OnlineMethod.getWeekOfDate(date);
@@ -531,9 +544,9 @@ public class PatrolInspectionPlanServiceImpl extends AbstractCrudService<PatrolI
                                 patrolInspectionPlanSon.setPlanDescribe(list.get(m).getPlanDescribe());
                                 patrolInspectionPlanSon.setCompletion(0);
                                 patrolInspectionPlanSon.setCreateTime(LocalDateTime.now());
-                                patrolInspectionPlanSon.setCreator(SecurityUtils.getUsername());
+                                patrolInspectionPlanSon.setCreator(list.get(m).getCreator());
                                 patrolInspectionPlanSon.setAlternateField("0");
-                                patrolInspectionPlanSon.setTenantId(SecurityUtils.getTenantId());
+                                patrolInspectionPlanSon.setTenantId(list.get(m).getTenantId());
                                 patrolInspectionPlanSon.setCompanyId(list.get(m).getCompanyId());
                                 patrolInspectionPlanSonService.save(patrolInspectionPlanSon);
                                 Integer zfid = patrolInspectionPlanSon.getId();

service-iot/service-iot-biz/src/main/java/com/usky/iot/mapper/DmpDeviceInfoMapper.java

@@ -4,6 +4,7 @@ import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.usky.backend.domain.ProductTVAttributeVO;
 import com.usky.common.mybatis.core.CrudMapper;
+import com.usky.iot.domain.BaseAlarm;
 import com.usky.iot.domain.DmpDeviceInfo;
 import com.usky.iot.domain.DmpProductInfo;
 import com.usky.iot.service.vo.DmpDeviceInfoRequest;
@@ -31,4 +32,6 @@ public interface DmpDeviceInfoMapper extends CrudMapper<DmpDeviceInfo> {
     Integer baseAlarmCount(@Param("deviceIdList") List<String> deviceIdList);
 
     Integer deviceOfflineCount(@Param("deviceIdList") List<String> deviceIdList);
+
+    List<BaseAlarm> baseAlarmList(@Param("deviceIdList") List<String> deviceIdList);
 }

service-iot/service-iot-biz/src/main/java/com/usky/iot/service/impl/DmpDeviceInfoServiceImpl.java

@@ -607,6 +607,8 @@ public class DmpDeviceInfoServiceImpl extends AbstractCrudService<DmpDeviceInfoM
                 queryWrapper1.in(DmpDeviceStatus::getDeviceId,deviceIdList);
                 List<DmpDeviceStatus> deviceStatusList = dmpDeviceStatusService.list(queryWrapper1);
 
+                List<BaseAlarm> baseAlarmList = baseMapper.baseAlarmList(deviceIdList);
+
                 List<DataRealTimeResponseVO> dataRealList = deviceDataClient.data(null,deviceIdList);
                 for(int i=0;i<page.getRecords().size();i++){
                     DataTVResponseVO dataTVResponseVO = new DataTVResponseVO();
@@ -622,6 +624,24 @@ public class DmpDeviceInfoServiceImpl extends AbstractCrudService<DmpDeviceInfoM
                         }
                     }
 
+                    if(CollectionUtils.isNotEmpty(baseAlarmList)){
+                        for (int j = 0; j < baseAlarmList.size(); j++) {
+                            if(page.getRecords().get(i).getDeviceId().equals(baseAlarmList.get(j).getDeviceId())){
+                                List<BaseAlarmVO> list1 = new ArrayList<>();
+                                if(baseAlarmList.get(j).getAlarmType().equals("815")){
+                                    dataTVResponseVO.setAlarmStatus(2);
+                                }else{
+                                    dataTVResponseVO.setAlarmStatus(1);
+                                }
+                                BaseAlarmVO baseAlarmVO = new BaseAlarmVO();
+                                baseAlarmVO.setAlarmContent(baseAlarmList.get(j).getAlarmContent());
+                                baseAlarmVO.setAlarmTime((baseAlarmList.get(j).getAlarmTime()).format(DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss")));
+                                list1.add(baseAlarmVO);
+                                dataTVResponseVO.setAlarmList(list1);
+                            }
+                        }
+                    }
+
                     List<DeviceAttributeVO> list1 = new ArrayList<>();
                     if(dataRealList.size() > 0){
                         for (int j = 0; j < dataRealList.size(); j++) {

service-iot/service-iot-biz/src/main/resources/mapper/iot/DmpDeviceInfoMapper.xml

@@ -104,5 +104,16 @@
             </if>
         </where>
     </select>
+    <select id="baseAlarmList" resultType="com.usky.iot.domain.BaseAlarm">
+        select *
+        from base_alarm
+        <where>
+            and device_id|alarm_time in (select device_id|max(alarm_time) from base_alarm where device_id in
+            <foreach item="item" collection="deviceIdList" open="(" separator="," close=")">
+                #{item}
+            </foreach>
+            and handle_status = 0 group by device_id)
+        </where>
+    </select>
 
 </mapper>

service-issue/service-issue-biz/src/main/java/com/usky/issue/controller/web/SpOwnerController.java

@@ -0,0 +1,21 @@
+package com.usky.issue.controller.web;
+
+
+import org.springframework.web.bind.annotation.RequestMapping;
+
+import org.springframework.stereotype.Controller;
+
+/**
+ * <p>
+ *  前端控制器
+ * </p>
+ *
+ * @author fu
+ * @since 2024-01-04
+ */
+@Controller
+@RequestMapping("/spOwner")
+public class SpOwnerController {
+
+}
+

service-issue/service-issue-biz/src/main/java/com/usky/issue/domain/SpOwner.java

@@ -0,0 +1,171 @@
+package com.usky.issue.domain;
+
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableId;
+import java.time.LocalDateTime;
+import com.baomidou.mybatisplus.annotation.TableField;
+import java.io.Serializable;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+
+/**
+ * <p>
+ * 
+ * </p>
+ *
+ * @author fu
+ * @since 2024-01-04
+ */
+@Data
+@EqualsAndHashCode(callSuper = false)
+public class SpOwner implements Serializable {
+
+    private static final long serialVersionUID = 1L;
+
+    /**
+     * id
+     */
+    @TableId(value = "id", type = IdType.AUTO)
+    private Integer id;
+
+    /**
+     * 单位编号
+     */
+    private String ownerCode;
+
+    /**
+     * 单位名称
+     */
+    private String ownerName;
+
+    /**
+     * 单元地址
+     */
+    private String unitinfo;
+
+    /**
+     * 楼层
+     */
+    private String louyu;
+
+    /**
+     * sim卡
+     */
+    private String sim;
+
+    /**
+     * 维保时间
+     */
+    @TableField("maintainTime")
+    private String maintainTime;
+
+    /**
+     * 对应方法
+     */
+    private Integer destAddress;
+
+    /**
+     * 省
+     */
+    private String addr1;
+
+    /**
+     * 市
+     */
+    private String addr2;
+
+    /**
+     * 区、县
+     */
+    private String addr3;
+
+    /**
+     * 地址
+     */
+    private String address;
+
+    /**
+     * 位置
+     */
+    private String posistion;
+
+    /**
+     * 安装时间
+     */
+    private LocalDateTime installTime;
+
+    /**
+     * 安装人
+     */
+    private String installMan;
+
+    /**
+     * 1火系统  2水系统 3烟感系统 4消防栓，5液位 6rtu 7电气火灾 8防火门 9气体灭火 10人脸识别 16视频监控 128井盖 
+     */
+    private Integer dwtype;
+
+    /**
+     * 型号 id,方法
+     */
+    private String ownerXh;
+
+    /**
+     * 间隔时间
+     */
+    private Integer sInterval;
+
+    /**
+     * 社区
+     */
+    private String community;
+
+    /**
+     * 所属单位
+     */
+    private String company;
+
+    private String rtmp;
+
+    private String hls;
+
+    private String html5;
+
+    private String danwei;
+
+    /**
+     * 倍率
+     */
+    private String ownerBl;
+
+    /**
+     * 报告推送参数1
+     */
+    private Integer pushParam1;
+
+    /**
+     * 报告推送参数2
+     */
+    private Integer pushParam2;
+
+    /**
+     * 报告推送参数3
+     */
+    private Integer pushParam3;
+
+    /**
+     * 报告推送参数4
+     */
+    private Integer pushParam4;
+
+    /**
+     * 登录参数Json格式存储
+     */
+    private String loginParam;
+
+    /**
+     * 传输类型
+     */
+    private String transferType;
+
+
+}

service-issue/service-issue-biz/src/main/java/com/usky/issue/mapper/SpOwnerMapper.java

@@ -0,0 +1,16 @@
+package com.usky.issue.mapper;
+
+import com.usky.issue.domain.SpOwner;
+import com.usky.common.mybatis.core.CrudMapper;
+
+/**
+ * <p>
+ *  Mapper 接口
+ * </p>
+ *
+ * @author fu
+ * @since 2024-01-04
+ */
+public interface SpOwnerMapper extends CrudMapper<SpOwner> {
+
+}

service-issue/service-issue-biz/src/main/java/com/usky/issue/service/SpOwnerService.java

@@ -0,0 +1,16 @@
+package com.usky.issue.service;
+
+import com.usky.issue.domain.SpOwner;
+import com.usky.common.mybatis.core.CrudService;
+
+/**
+ * <p>
+ *  服务类
+ * </p>
+ *
+ * @author fu
+ * @since 2024-01-04
+ */
+public interface SpOwnerService extends CrudService<SpOwner> {
+
+}

service-issue/service-issue-biz/src/main/java/com/usky/issue/service/impl/SpHj2017ServiceImpl.java

@@ -2,18 +2,17 @@ package com.usky.issue.service.impl;
 
 import com.alibaba.fastjson.JSONObject;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.baomidou.mybatisplus.core.toolkit.CollectionUtils;
 import com.baomidou.mybatisplus.core.toolkit.Wrappers;
-
-import com.usky.common.core.exception.BusinessException;
 import com.usky.issue.domain.SpHj2017;
-import com.usky.issue.domain.SpRtu2017;
+import com.usky.issue.domain.SpOwner;
 import com.usky.issue.mapper.SpHj2017Mapper;
 import com.usky.issue.service.SpHj2017Service;
 import com.usky.common.mybatis.core.AbstractCrudService;
-import org.apache.commons.lang3.StringUtils;
+import com.usky.issue.service.SpOwnerService;
+import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
-import java.time.LocalDateTime;
 import java.util.List;
 import java.util.Map;
 
@@ -27,6 +26,9 @@ import java.util.Map;
  */
 @Service
 public class SpHj2017ServiceImpl extends AbstractCrudService<SpHj2017Mapper, SpHj2017> implements SpHj2017Service {
+    @Autowired
+    private SpOwnerService spOwnerService;
+
     @Override
     public List<Map<String, Object>> statusCount(String requestBody) {
         JSONObject requestVO = JSONObject.parseObject(requestBody);
@@ -40,7 +42,23 @@ public class SpHj2017ServiceImpl extends AbstractCrudService<SpHj2017Mapper, SpH
         queryWrapper.last("LIMIT " + pageSize + " OFFSET " + startIndex)
                 .orderByDesc("id");
         List<Map<String, Object>> deviceStatusList = this.listMaps(queryWrapper);
-
+        QueryWrapper<SpOwner> queryWrapper1 = Wrappers.query();
+        queryWrapper1.select("owner_code","unitinfo")
+                .eq("company",companyCode)
+                .in("dwtype",1,3);
+        List<Map<String, Object>> deviceInfoList = spOwnerService.listMaps(queryWrapper1);
+        if(CollectionUtils.isNotEmpty(deviceStatusList)){
+            for (int i=0;i<deviceStatusList.size();i++){
+                if(CollectionUtils.isNotEmpty(deviceInfoList)){
+                    for (int j=0;j<deviceInfoList.size();j++){
+                        if(deviceStatusList.get(i).get("device_code").equals(deviceInfoList.get(j).get("owner_code"))){
+                            deviceStatusList.get(i).put("device_address",deviceInfoList.get(j).get("unitinfo"));
+                            break;
+                        }
+                    }
+                }
+            }
+        }
         return deviceStatusList;
     }
 

service-issue/service-issue-biz/src/main/java/com/usky/issue/service/impl/SpOwnerServiceImpl.java

@@ -0,0 +1,20 @@
+package com.usky.issue.service.impl;
+
+import com.usky.issue.domain.SpOwner;
+import com.usky.issue.mapper.SpOwnerMapper;
+import com.usky.issue.service.SpOwnerService;
+import com.usky.common.mybatis.core.AbstractCrudService;
+import org.springframework.stereotype.Service;
+
+/**
+ * <p>
+ *  服务实现类
+ * </p>
+ *
+ * @author fu
+ * @since 2024-01-04
+ */
+@Service
+public class SpOwnerServiceImpl extends AbstractCrudService<SpOwnerMapper, SpOwner> implements SpOwnerService {
+
+}

service-issue/service-issue-biz/src/main/java/com/usky/issue/service/impl/SpRtu2017ServiceImpl.java

@@ -2,14 +2,18 @@ package com.usky.issue.service.impl;
 
 import com.alibaba.fastjson.JSONObject;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.baomidou.mybatisplus.core.toolkit.CollectionUtils;
 import com.baomidou.mybatisplus.core.toolkit.Wrappers;
 
 import com.usky.common.core.exception.BusinessException;
+import com.usky.issue.domain.SpOwner;
 import com.usky.issue.domain.SpRtu2017;
 import com.usky.issue.mapper.SpRtu2017Mapper;
+import com.usky.issue.service.SpOwnerService;
 import com.usky.issue.service.SpRtu2017Service;
 import com.usky.common.mybatis.core.AbstractCrudService;
 import org.apache.commons.lang3.StringUtils;
+import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
 import java.time.LocalDateTime;
@@ -27,6 +31,8 @@ import java.util.Map;
  */
 @Service
 public class SpRtu2017ServiceImpl extends AbstractCrudService<SpRtu2017Mapper, SpRtu2017> implements SpRtu2017Service {
+    @Autowired
+    private SpOwnerService spOwnerService;
 
     @Override
     public List<Map<String, Object>> statusCount(String requestBody) {
@@ -41,7 +47,23 @@ public class SpRtu2017ServiceImpl extends AbstractCrudService<SpRtu2017Mapper, S
         queryWrapper.last("LIMIT " + pageSize + " OFFSET " + startIndex)
                 .orderByDesc("id");
         List<Map<String, Object>> deviceStatusList = this.listMaps(queryWrapper);
-
+        QueryWrapper<SpOwner> queryWrapper1 = Wrappers.query();
+        queryWrapper1.select("owner_code","unitinfo")
+                .eq("company",companyCode)
+                .eq("dwtype",6);
+        List<Map<String, Object>> deviceInfoList = spOwnerService.listMaps(queryWrapper1);
+        if(CollectionUtils.isNotEmpty(deviceStatusList)){
+            for (int i=0;i<deviceStatusList.size();i++){
+                if(CollectionUtils.isNotEmpty(deviceInfoList)){
+                    for (int j=0;j<deviceInfoList.size();j++){
+                        if(deviceStatusList.get(i).get("device_code").equals(deviceInfoList.get(j).get("owner_code"))){
+                            deviceStatusList.get(i).put("device_address",deviceInfoList.get(j).get("unitinfo"));
+                            break;
+                        }
+                    }
+                }
+            }
+        }
         return deviceStatusList;
     }
 

service-issue/service-issue-biz/src/main/java/com/usky/issue/service/impl/SpSj2017ServiceImpl.java

@@ -2,14 +2,18 @@ package com.usky.issue.service.impl;
 
 import com.alibaba.fastjson.JSONObject;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.baomidou.mybatisplus.core.toolkit.CollectionUtils;
 import com.baomidou.mybatisplus.core.toolkit.Wrappers;
 import com.usky.common.core.exception.BusinessException;
+import com.usky.issue.domain.SpOwner;
 import com.usky.issue.domain.SpRtu2017;
 import com.usky.issue.domain.SpSj2017;
 import com.usky.issue.mapper.SpSj2017Mapper;
+import com.usky.issue.service.SpOwnerService;
 import com.usky.issue.service.SpSj2017Service;
 import com.usky.common.mybatis.core.AbstractCrudService;
 import org.apache.commons.lang3.StringUtils;
+import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
 import java.time.LocalDateTime;
@@ -26,6 +30,9 @@ import java.util.Map;
  */
 @Service
 public class SpSj2017ServiceImpl extends AbstractCrudService<SpSj2017Mapper, SpSj2017> implements SpSj2017Service {
+    @Autowired
+    private SpOwnerService spOwnerService;
+
     @Override
     public List<Map<String, Object>> statusCount(String requestBody) {
         JSONObject requestVO = JSONObject.parseObject(requestBody);
@@ -39,6 +46,23 @@ public class SpSj2017ServiceImpl extends AbstractCrudService<SpSj2017Mapper, SpS
         queryWrapper.last("LIMIT " + pageSize + " OFFSET " + startIndex)
                     .orderByDesc("id");
         List<Map<String, Object>> deviceStatusList = this.listMaps(queryWrapper);
+        QueryWrapper<SpOwner> queryWrapper1 = Wrappers.query();
+        queryWrapper1.select("owner_code","unitinfo")
+                .eq("company",companyCode)
+                .in("dwtype",2,5);
+        List<Map<String, Object>> deviceInfoList = spOwnerService.listMaps(queryWrapper1);
+        if(CollectionUtils.isNotEmpty(deviceStatusList)){
+            for (int i=0;i<deviceStatusList.size();i++){
+                if(CollectionUtils.isNotEmpty(deviceInfoList)){
+                    for (int j=0;j<deviceInfoList.size();j++){
+                        if(deviceStatusList.get(i).get("device_code").equals(deviceInfoList.get(j).get("owner_code"))){
+                            deviceStatusList.get(i).put("device_address",deviceInfoList.get(j).get("unitinfo"));
+                            break;
+                        }
+                    }
+                }
+            }
+        }
         return deviceStatusList;
     }
 

service-issue/service-issue-biz/src/main/resources/mapper/issue/SpOwnerMapper.xml

@@ -0,0 +1,40 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.usky.issue.mapper.SpOwnerMapper">
+
+    <!-- 通用查询映射结果 -->
+    <resultMap id="BaseResultMap" type="com.usky.issue.domain.SpOwner">
+        <id column="id" property="id" />
+        <result column="owner_code" property="ownerCode" />
+        <result column="owner_name" property="ownerName" />
+        <result column="unitinfo" property="unitinfo" />
+        <result column="louyu" property="louyu" />
+        <result column="sim" property="sim" />
+        <result column="maintainTime" property="maintainTime" />
+        <result column="dest_address" property="destAddress" />
+        <result column="addr1" property="addr1" />
+        <result column="addr2" property="addr2" />
+        <result column="addr3" property="addr3" />
+        <result column="address" property="address" />
+        <result column="posistion" property="posistion" />
+        <result column="install_time" property="installTime" />
+        <result column="install_man" property="installMan" />
+        <result column="dwtype" property="dwtype" />
+        <result column="owner_xh" property="ownerXh" />
+        <result column="s_interval" property="sInterval" />
+        <result column="community" property="community" />
+        <result column="company" property="company" />
+        <result column="rtmp" property="rtmp" />
+        <result column="hls" property="hls" />
+        <result column="html5" property="html5" />
+        <result column="danwei" property="danwei" />
+        <result column="owner_bl" property="ownerBl" />
+        <result column="push_param1" property="pushParam1" />
+        <result column="push_param2" property="pushParam2" />
+        <result column="push_param3" property="pushParam3" />
+        <result column="push_param4" property="pushParam4" />
+        <result column="login_param" property="loginParam" />
+        <result column="transfer_type" property="transferType" />
+    </resultMap>
+
+</mapper>

service-website/service-website-biz/src/main/java/com/usky/website/service/impl/SiteCategoryServiceImpl.java

@@ -108,7 +108,7 @@ public class SiteCategoryServiceImpl extends AbstractCrudService<SiteCategoryMap
 
     private List<SiteCategory> getChildrenData(SiteCategory root, List<SiteCategory> all) {
         List<SiteCategory> children = all.stream().filter(subjectVO ->
-                subjectVO.getPid() == root.getId() && !root.getCategoryName().equals("产品服务") && !root.getCategoryName().equals("客户案例")
+                subjectVO.getPid().equals(root.getId()) && !root.getCategoryName().equals("产品服务") && !root.getCategoryName().equals("客户案例")
         ).map(subjectVO -> {
             subjectVO.setChildren(getChildrenData(subjectVO, all));
             return subjectVO;