feat: 完善分享列表

backend/src/main/java/io/dataease/base/mapper/ext/ExtPanelShareMapper.java

@@ -3,6 +3,7 @@ package io.dataease.base.mapper.ext;
 import io.dataease.base.domain.PanelShare;
 import io.dataease.base.mapper.ext.query.GridExample;
 import io.dataease.dto.panel.PanelShareDto;
+import io.dataease.dto.panel.PanelSharePo;
 import org.apache.ibatis.annotations.Param;
 
 import java.util.List;
@@ -11,7 +12,7 @@ public interface ExtPanelShareMapper {
 
     int batchInsert(@Param("shares") List<PanelShare> shares);
 
-    List<PanelShareDto> query(GridExample example);
+    List<PanelSharePo> query(GridExample example);
 
     List<PanelShare> queryWithResource(GridExample example);
 }

backend/src/main/java/io/dataease/base/mapper/ext/ExtPanelShareMapper.xml

@@ -2,11 +2,10 @@
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd" >
 <mapper namespace="io.dataease.base.mapper.ext.ExtPanelShareMapper">
 
-    <resultMap id="treeNodeMap" type="io.dataease.dto.panel.PanelShareDto">
+    <resultMap id="treeNodeMap" type="io.dataease.dto.panel.PanelSharePo">
         <id column="id" property="id" />
         <result column="name" property="name" />
-        <result column="pid" property="pid" />
-        <result column="creator" property="create_by" />
+        <result column="creator" property="creator" />
     </resultMap>
 
     <insert id="batchInsert" parameterType="io.dataease.base.domain.PanelShare">
@@ -18,7 +17,7 @@
     </insert>
 
     <select id="query" parameterType="io.dataease.base.mapper.ext.query.GridExample" resultMap="treeNodeMap">
-        select s.panel_group_id as id, g.create_by as pid, g.name
+        select s.panel_group_id as id, g.create_by as creator, g.name
         from panel_share s
         left join panel_group g on g.id = s.panel_group_id
         <if test="_parameter != null">

backend/src/main/java/io/dataease/dto/panel/PanelShareDto.java

@@ -1,21 +1,15 @@
 package io.dataease.dto.panel;
 
 import io.swagger.annotations.ApiModelProperty;
-import lombok.Builder;
 import lombok.Data;
+import lombok.NoArgsConstructor;
 
 import java.util.List;
 
 @Data
-@Builder
-public class PanelShareDto {
+@NoArgsConstructor
+public class PanelShareDto extends PanelSharePo{
 
-    @ApiModelProperty("节点ID")
-    private String id;
-    @ApiModelProperty("名称")
-    private String name;
-    @ApiModelProperty("节点父ID")
-    private String creator;
     @ApiModelProperty("子节点")
     private List<PanelShareDto> children;
 

backend/src/main/java/io/dataease/dto/panel/PanelSharePo.java

@@ -0,0 +1,20 @@
+package io.dataease.dto.panel;
+
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+
+
+@Data
+@NoArgsConstructor
+public class PanelSharePo {
+
+    @ApiModelProperty("节点ID")
+    private String id;
+    @ApiModelProperty("名称")
+    private String name;
+    @ApiModelProperty("节点父ID")
+    private String creator;
+
+
+}

backend/src/main/java/io/dataease/service/panel/ShareService.java

@@ -7,11 +7,13 @@ import io.dataease.base.mapper.PanelShareMapper;
 import io.dataease.base.mapper.ext.ExtPanelShareMapper;
 import io.dataease.base.mapper.ext.query.GridExample;
 import io.dataease.commons.utils.AuthUtils;
+import io.dataease.commons.utils.BeanUtils;
 import io.dataease.commons.utils.CommonBeanFactory;
 import io.dataease.controller.request.panel.PanelShareRequest;
 import io.dataease.controller.sys.base.BaseGridRequest;
 import io.dataease.controller.sys.base.ConditionEntity;
 import io.dataease.dto.panel.PanelShareDto;
+import io.dataease.dto.panel.PanelSharePo;
 import org.apache.commons.collections.CollectionUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
@@ -96,14 +98,20 @@ public class ShareService {
         request.setConditions(new ArrayList<ConditionEntity>(){{add(condition);}});
 
         GridExample example = request.convertExample();
-        List<PanelShareDto> datas = extPanelShareMapper.query(example);
-        return convertTree(datas);
+        List<PanelSharePo> datas = extPanelShareMapper.query(example);
+        List<PanelShareDto> dtoLists = datas.stream().map(po -> BeanUtils.copyBean(new PanelShareDto(), po)).collect(Collectors.toList());
+        return convertTree(dtoLists);
     }
 
     //List构建Tree
     private List<PanelShareDto> convertTree(List<PanelShareDto> datas){
         Map<String, List<PanelShareDto>> map = datas.stream().collect(Collectors.groupingBy(PanelShareDto::getCreator));
-        return map.entrySet().stream().map(entry -> PanelShareDto.builder().name(entry.getKey()).children(entry.getValue()).build()).collect(Collectors.toList());
+        return map.entrySet().stream().map(entry -> {
+            PanelShareDto panelShareDto = new PanelShareDto();
+            panelShareDto.setName(entry.getKey());
+            panelShareDto.setChildren(entry.getValue());
+            return panelShareDto;
+        }).collect(Collectors.toList());
     }
 
     public List<PanelShare> queryWithResource(BaseGridRequest request){