From 9cd2536e7132d69a871341216caa6ea937420a34 Mon Sep 17 00:00:00 2001 From: yuezhihang Date: Wed, 6 Jul 2022 17:53:01 +0800 Subject: [PATCH] =?UTF-8?q?=E8=B5=84=E6=96=99=E4=B8=AD=E5=BF=83=20?= =?UTF-8?q?=E6=8E=A5=E5=8F=A3=20=E4=BB=A5=E5=8F=8Asql?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../dao/FileMaterialDao.java | 6 ++ .../entity/FileMaterial.java | 4 + .../entity/FileMaterialPage.java | 2 + .../service/impl/FileMaterialServiceImpl.java | 27 +----- .../zlTree/controller/ZlTreeController.java | 72 +++++++++++++++ .../controller/ZlTreeDataController.java | 54 +++++++++++ .../com/adc/da/slrs/zlTree/dao/ZlTreeDao.java | 19 ++++ .../adc/da/slrs/zlTree/dao/ZlTreeDataDao.java | 17 ++++ .../adc/da/slrs/zlTree/entity/TreeData.java | 40 +++++++++ .../com/adc/da/slrs/zlTree/entity/ZlTree.java | 44 +++++++++ .../adc/da/slrs/zlTree/entity/ZlTreeData.java | 38 ++++++++ .../zlTree/service/IZlTreeDataService.java | 19 ++++ .../slrs/zlTree/service/IZlTreeService.java | 43 +++++++++ .../service/impl/ZlTreeDataServiceImpl.java | 23 +++++ .../service/impl/ZlTreeServiceImpl.java | 90 +++++++++++++++++++ .../fileMaterialCenter/FileMaterialMapper.xml | 24 +++++ doc/sql/20220706_新表.sql | 24 +++++ 17 files changed, 521 insertions(+), 25 deletions(-) create mode 100644 adc-da-slrs/src/main/java/com/adc/da/slrs/zlTree/controller/ZlTreeController.java create mode 100644 adc-da-slrs/src/main/java/com/adc/da/slrs/zlTree/controller/ZlTreeDataController.java create mode 100644 adc-da-slrs/src/main/java/com/adc/da/slrs/zlTree/dao/ZlTreeDao.java create mode 100644 adc-da-slrs/src/main/java/com/adc/da/slrs/zlTree/dao/ZlTreeDataDao.java create mode 100644 adc-da-slrs/src/main/java/com/adc/da/slrs/zlTree/entity/TreeData.java create mode 100644 adc-da-slrs/src/main/java/com/adc/da/slrs/zlTree/entity/ZlTree.java create mode 100644 adc-da-slrs/src/main/java/com/adc/da/slrs/zlTree/entity/ZlTreeData.java create mode 100644 adc-da-slrs/src/main/java/com/adc/da/slrs/zlTree/service/IZlTreeDataService.java create mode 100644 adc-da-slrs/src/main/java/com/adc/da/slrs/zlTree/service/IZlTreeService.java create mode 100644 adc-da-slrs/src/main/java/com/adc/da/slrs/zlTree/service/impl/ZlTreeDataServiceImpl.java create mode 100644 adc-da-slrs/src/main/java/com/adc/da/slrs/zlTree/service/impl/ZlTreeServiceImpl.java create mode 100644 doc/sql/20220706_新表.sql diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/fileMaterialCenter/dao/FileMaterialDao.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/fileMaterialCenter/dao/FileMaterialDao.java index 7fb80943..e4b2bac8 100644 --- a/adc-da-slrs/src/main/java/com/adc/da/slrs/fileMaterialCenter/dao/FileMaterialDao.java +++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/fileMaterialCenter/dao/FileMaterialDao.java @@ -1,7 +1,10 @@ package com.adc.da.slrs.fileMaterialCenter.dao; import com.adc.da.slrs.fileMaterialCenter.entity.FileMaterial; +import com.adc.da.slrs.fileMaterialCenter.entity.FileMaterialPage; +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.baomidou.mybatisplus.core.metadata.IPage; import org.apache.ibatis.annotations.Param; /** @@ -16,4 +19,7 @@ public interface FileMaterialDao extends BaseMapper { int topping(@Param("id") String id); + + + IPage getFileMaterialPage(IPage page, @Param("flieM") FileMaterialPage fileMaterialPage); } diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/fileMaterialCenter/entity/FileMaterial.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/fileMaterialCenter/entity/FileMaterial.java index a3207127..a78643c7 100644 --- a/adc-da-slrs/src/main/java/com/adc/da/slrs/fileMaterialCenter/entity/FileMaterial.java +++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/fileMaterialCenter/entity/FileMaterial.java @@ -67,4 +67,8 @@ public class FileMaterial extends BaseEntity { @ApiModelProperty(value = "删除标志") @TableLogic(value = "0",delval = "1") private String delFlag; + + @ApiModelProperty(value = "删除标志") + @TableField("is_show") + private String isShow; } diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/fileMaterialCenter/entity/FileMaterialPage.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/fileMaterialCenter/entity/FileMaterialPage.java index 78a7b927..3cf6d7e1 100644 --- a/adc-da-slrs/src/main/java/com/adc/da/slrs/fileMaterialCenter/entity/FileMaterialPage.java +++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/fileMaterialCenter/entity/FileMaterialPage.java @@ -18,6 +18,8 @@ public class FileMaterialPage { private String endDataUploadTime; + private String treeId; + private Integer page; diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/fileMaterialCenter/service/impl/FileMaterialServiceImpl.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/fileMaterialCenter/service/impl/FileMaterialServiceImpl.java index b333c70c..39b26c26 100644 --- a/adc-da-slrs/src/main/java/com/adc/da/slrs/fileMaterialCenter/service/impl/FileMaterialServiceImpl.java +++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/fileMaterialCenter/service/impl/FileMaterialServiceImpl.java @@ -8,6 +8,7 @@ import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.core.metadata.IPage; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; +import org.apache.commons.lang3.StringUtils; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; @@ -32,37 +33,13 @@ public class FileMaterialServiceImpl extends ServiceImpl getFileMaterial(FileMaterialPage queryPage) { - - QueryWrapper queryWrapper = new QueryWrapper<>(); - - if (queryPage.getDataType()!=null){ - queryWrapper.eq("data_type",queryPage.getDataType()); - } - - if (queryPage.getDataTitle()!=null){ - queryWrapper.like("data_title",queryPage.getDataTitle()); - } - - if (queryPage.getStartDataUploadTime()!=null && queryPage.getEndDataUploadTime()!=null){ - - - String strDateFormat = "yyyy-MM-dd HH:mm:ss"; - SimpleDateFormat sdf = new SimpleDateFormat(strDateFormat); - queryWrapper.between("data_upload_time", queryPage.getStartDataUploadTime(), - queryPage.getEndDataUploadTime()); - } - - if (queryPage.getId()!=null && !"".equals(queryPage.getId()) ){ - queryWrapper.eq("id",queryPage.getId()); - } IPage page=null; if (queryPage.getPage()==null || queryPage .getPageSize()==null){ page=new Page<>(1,1); }else { page=new Page<>(queryPage.getPage(),queryPage.getPageSize()); } - - return this.page(page,queryWrapper); + return fileMaterialDao.getFileMaterialPage(page,queryPage); } @Override diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/zlTree/controller/ZlTreeController.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/zlTree/controller/ZlTreeController.java new file mode 100644 index 00000000..8ee248ab --- /dev/null +++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/zlTree/controller/ZlTreeController.java @@ -0,0 +1,72 @@ +package com.adc.da.slrs.zlTree.controller; + + +import com.adc.da.base.web.BaseController; +import com.adc.da.http.ResponseMessage; +import com.adc.da.http.Result; +import com.adc.da.slrs.zlTree.entity.TreeData; +import com.adc.da.slrs.zlTree.entity.ZlTree; +import com.adc.da.slrs.zlTree.service.IZlTreeService; +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiModelProperty; +import io.swagger.annotations.ApiOperation; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.web.bind.annotation.*; + +import java.util.Arrays; +import java.util.List; + +/** +*

+ * 前端控制器 + *

+* +* @author zhaokaiyao +* @since 2021-12-14 +*/ +@RestController +@Api(description = "资料中心") +@RequestMapping("/${restPath}/fileMaterialCenter/zlTree") +public class ZlTreeController extends BaseController { + + @Autowired + IZlTreeService iZlTreeService; + + @PostMapping + @ApiOperation("新增资料中心左侧树节点") + public ResponseMessage addFileMaterial(@RequestBody ZlTree material){ + + boolean save = iZlTreeService.save(material); + return Result.success(save); + } + + + @DeleteMapping + @ApiOperation("删除树节点") + public ResponseMessage deleteMaterial(String id){ + List idList = Arrays.asList(id.split(",")); + boolean b = iZlTreeService.removeByIds(idList); + return Result.success(b); + + } + + + @GetMapping + @ApiOperation("查询树结构") + public ResponseMessage getFileMaterial(){ + TreeData fileMaterial = iZlTreeService.getLeftTree(); + return Result.success(fileMaterial); + } + + + @PutMapping + @ApiOperation("修改树节点") + public ResponseMessage updateFileMaterial(@RequestBody ZlTree zlTree){ + boolean b = iZlTreeService.updateById(zlTree); + + return Result.success(b); + } + + + +} diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/zlTree/controller/ZlTreeDataController.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/zlTree/controller/ZlTreeDataController.java new file mode 100644 index 00000000..628404f2 --- /dev/null +++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/zlTree/controller/ZlTreeDataController.java @@ -0,0 +1,54 @@ +package com.adc.da.slrs.zlTree.controller; + + +import com.adc.da.base.web.BaseController; +import com.adc.da.http.ResponseMessage; +import com.adc.da.http.Result; +import com.adc.da.slrs.zlTree.entity.ZlTree; +import com.adc.da.slrs.zlTree.entity.ZlTreeData; +import com.adc.da.slrs.zlTree.service.IZlTreeDataService; +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiOperation; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.web.bind.annotation.*; + +/** +*

+ * 前端控制器 + *

+* +* @author zhaokaiyao +* @since 2021-12-14 +*/ +@RestController +@Api(description = "资料中心") +@RequestMapping("/${restPath}/fileMaterialCenter/zlTreeData") +public class ZlTreeDataController extends BaseController { + + @Autowired + IZlTreeDataService iZlTreeService; + + @PostMapping(value = "/add") + @ApiOperation("树与数据关联") + public ResponseMessage addFileMaterial(@RequestBody ZlTreeData zlTreeData){ + + boolean save = iZlTreeService.save(zlTreeData); + return Result.success(save); + } + + + @PostMapping(value = "/remove") + @ApiOperation("树与数据关联移除") + public ResponseMessage deleteMaterial(@RequestBody ZlTreeData zlTreeData){ + QueryWrapper wrapper=new QueryWrapper<>(); + wrapper.eq("id",zlTreeData.getId()); + wrapper.eq("data_id",zlTreeData.getDataId()); + boolean b = iZlTreeService.remove(wrapper); + return Result.success(b); + + } + + + +} diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/zlTree/dao/ZlTreeDao.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/zlTree/dao/ZlTreeDao.java new file mode 100644 index 00000000..e7527d15 --- /dev/null +++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/zlTree/dao/ZlTreeDao.java @@ -0,0 +1,19 @@ +package com.adc.da.slrs.zlTree.dao; + +import com.adc.da.slrs.zlTree.entity.ZlTree; +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import org.apache.ibatis.annotations.Param; + +/** + *

+ * Mapper 接口 + *

+ * + * @author zhaokaiyao + * @since 2021-12-14 + */ +public interface ZlTreeDao extends BaseMapper { + + + int topping(@Param("id") String id); +} diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/zlTree/dao/ZlTreeDataDao.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/zlTree/dao/ZlTreeDataDao.java new file mode 100644 index 00000000..f4b0b546 --- /dev/null +++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/zlTree/dao/ZlTreeDataDao.java @@ -0,0 +1,17 @@ +package com.adc.da.slrs.zlTree.dao; + +import com.adc.da.slrs.zlTree.entity.ZlTreeData; +import com.baomidou.mybatisplus.core.mapper.BaseMapper; + +/** + *

+ * Mapper 接口 + *

+ * + * @author zhaokaiyao + * @since 2021-12-14 + */ +public interface ZlTreeDataDao extends BaseMapper { + + +} diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/zlTree/entity/TreeData.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/zlTree/entity/TreeData.java new file mode 100644 index 00000000..be1d65e1 --- /dev/null +++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/zlTree/entity/TreeData.java @@ -0,0 +1,40 @@ +package com.adc.da.slrs.zlTree.entity; + +import com.adc.da.base.entity.BaseEntity; +import com.baomidou.mybatisplus.annotation.TableField; +import com.baomidou.mybatisplus.annotation.TableId; +import com.baomidou.mybatisplus.annotation.TableName; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; +import lombok.EqualsAndHashCode; +import lombok.experimental.Accessors; + +import java.util.List; + +/** + *

+ * + *

+ * + * @author zhaokaiyao + * @since 2021-12-14 + */ +@Data +@EqualsAndHashCode(callSuper = true) +@Accessors(chain = true) +public class TreeData extends BaseEntity { + + private static final long serialVersionUID = 1L; + + @TableId + private String id; + + @ApiModelProperty(value = "父节点") + private String pId; + + @ApiModelProperty(value = "名称") + private String name; + + List children; + +} diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/zlTree/entity/ZlTree.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/zlTree/entity/ZlTree.java new file mode 100644 index 00000000..6337f62d --- /dev/null +++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/zlTree/entity/ZlTree.java @@ -0,0 +1,44 @@ +package com.adc.da.slrs.zlTree.entity; + +import com.adc.da.base.entity.BaseEntity; +import com.baomidou.mybatisplus.annotation.TableField; +import com.baomidou.mybatisplus.annotation.TableId; +import com.baomidou.mybatisplus.annotation.TableLogic; +import com.baomidou.mybatisplus.annotation.TableName; +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; +import lombok.EqualsAndHashCode; +import lombok.experimental.Accessors; + +import java.util.Date; + +/** + *

+ * + *

+ * + * @author zhaokaiyao + * @since 2021-12-14 + */ +@Data +@EqualsAndHashCode(callSuper = true) +@Accessors(chain = true) +@TableName("zl_tree") +public class ZlTree extends BaseEntity { + + private static final long serialVersionUID = 1L; + + @TableId + @ApiModelProperty(value = "主键") + private String id; + + @ApiModelProperty(value = "父节点") + @TableField("p_id") + private String pId; + + @ApiModelProperty(value = "名称") + @TableField("name") + private String name; + +} diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/zlTree/entity/ZlTreeData.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/zlTree/entity/ZlTreeData.java new file mode 100644 index 00000000..88823170 --- /dev/null +++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/zlTree/entity/ZlTreeData.java @@ -0,0 +1,38 @@ +package com.adc.da.slrs.zlTree.entity; + +import com.adc.da.base.entity.BaseEntity; +import com.baomidou.mybatisplus.annotation.TableField; +import com.baomidou.mybatisplus.annotation.TableId; +import com.baomidou.mybatisplus.annotation.TableName; +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; +import lombok.EqualsAndHashCode; +import lombok.experimental.Accessors; + +/** + *

+ * + *

+ * + * @author zhaokaiyao + * @since 2021-12-14 + */ +@Data +@EqualsAndHashCode(callSuper = true) +@Accessors(chain = true) +@TableName("zl_data") +public class ZlTreeData extends BaseEntity { + + private static final long serialVersionUID = 1L; + + @TableId + @ApiModelProperty(value = "主键") + private String id; + + @ApiModelProperty(value = "父节点") + @TableField("data_id") + private String dataId; + + +} diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/zlTree/service/IZlTreeDataService.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/zlTree/service/IZlTreeDataService.java new file mode 100644 index 00000000..5a9505e9 --- /dev/null +++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/zlTree/service/IZlTreeDataService.java @@ -0,0 +1,19 @@ +package com.adc.da.slrs.zlTree.service; + +import com.adc.da.slrs.zlTree.entity.ZlTreeData; +import com.baomidou.mybatisplus.extension.service.IService; + +/** + *

+ * 服务类 + *

+ * + * @author zhaokaiyao + * @since 2021-12-14 + */ +public interface IZlTreeDataService extends IService { + + + + +} diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/zlTree/service/IZlTreeService.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/zlTree/service/IZlTreeService.java new file mode 100644 index 00000000..6742fbf8 --- /dev/null +++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/zlTree/service/IZlTreeService.java @@ -0,0 +1,43 @@ +package com.adc.da.slrs.zlTree.service; + +import com.adc.da.slrs.zlTree.entity.TreeData; +import com.adc.da.slrs.zlTree.entity.ZlTree; +import com.baomidou.mybatisplus.core.metadata.IPage; +import com.baomidou.mybatisplus.extension.service.IService; + +import java.util.List; + +/** + *

+ * 服务类 + *

+ * + * @author zhaokaiyao + * @since 2021-12-14 + */ +public interface IZlTreeService extends IService { + + + /** + * 查询树结构 + * @param + * @return + */ + TreeData getLeftTree(); + + + /** + * 获取类型 + * @return + */ + List getFileMaterialType(); + + /** + * 置顶 + * @param id + * @return + */ + int topping(String id); + + +} diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/zlTree/service/impl/ZlTreeDataServiceImpl.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/zlTree/service/impl/ZlTreeDataServiceImpl.java new file mode 100644 index 00000000..5e7eedfd --- /dev/null +++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/zlTree/service/impl/ZlTreeDataServiceImpl.java @@ -0,0 +1,23 @@ +package com.adc.da.slrs.zlTree.service.impl; + +import com.adc.da.slrs.zlTree.dao.ZlTreeDataDao; +import com.adc.da.slrs.zlTree.entity.ZlTreeData; +import com.adc.da.slrs.zlTree.service.IZlTreeDataService; +import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; +import org.springframework.stereotype.Service; + +/** + *

+ * 服务实现类 + *

+ * + * @author zhaokaiyao + * @since 2021-12-14 + */ +@Service +public class ZlTreeDataServiceImpl extends ServiceImpl implements IZlTreeDataService { + + + + +} diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/zlTree/service/impl/ZlTreeServiceImpl.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/zlTree/service/impl/ZlTreeServiceImpl.java new file mode 100644 index 00000000..2ba3d0f6 --- /dev/null +++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/zlTree/service/impl/ZlTreeServiceImpl.java @@ -0,0 +1,90 @@ +package com.adc.da.slrs.zlTree.service.impl; + +import com.adc.da.slrs.zlTree.dao.ZlTreeDao; +import com.adc.da.slrs.zlTree.entity.TreeData; +import com.adc.da.slrs.zlTree.entity.ZlTree; +import com.adc.da.slrs.zlTree.entity.ZlTreeData; +import com.adc.da.slrs.zlTree.service.IZlTreeService; +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.baomidou.mybatisplus.core.metadata.IPage; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; +import org.apache.commons.lang3.StringUtils; +import org.springframework.beans.BeanUtils; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.stereotype.Service; + +import java.text.SimpleDateFormat; +import java.util.ArrayList; +import java.util.List; + +/** + *

+ * 服务实现类 + *

+ * + * @author zhaokaiyao + * @since 2021-12-14 + */ +@Service +public class ZlTreeServiceImpl extends ServiceImpl implements IZlTreeService { + + @Autowired + ZlTreeDao zlTreeDao; + + + @Override + public TreeData getLeftTree() { + TreeData res=new TreeData(); + List list=this.list(); + List treeData=new ArrayList<>(); + //代码遍历生成树 + for (ZlTree zlTree:list) { + if (StringUtils.isNotBlank(zlTree.getPId())){ + TreeData zlTreeData=new TreeData(); + BeanUtils.copyProperties(zlTree,zlTreeData); + treeData.add(zlTreeData); + }else { + BeanUtils.copyProperties(zlTree,res); + } + } + //递归生成树 + digui(res,treeData); + + return res; + } + + private void digui(TreeData res,List treeData){ + for (TreeData data:treeData) { + if (res.getId().equals(data.getPId())){ + if (null!=res.getChildren()){ + res.getChildren().add(data); + }else { + List data1=new ArrayList<>(); + data1.add(data); + res.setChildren(data1); + } + } + } + if (null!=res.getChildren()){ + for (TreeData treeData1:res.getChildren()) { + digui(treeData1,treeData); + } + } + } + + + + @Override + public List getFileMaterialType() { + QueryWrapper queryWrapper = new QueryWrapper<>(); + + queryWrapper.select("DISTINCT data_type"); + return this.listObjs(queryWrapper, item -> item.toString()); + } + + @Override + public int topping(String id) { + return zlTreeDao.topping(id); + } +} diff --git a/adc-da-slrs/src/main/resources/mybatis/mapper/fileMaterialCenter/FileMaterialMapper.xml b/adc-da-slrs/src/main/resources/mybatis/mapper/fileMaterialCenter/FileMaterialMapper.xml index 883a0e98..9a29da42 100644 --- a/adc-da-slrs/src/main/resources/mybatis/mapper/fileMaterialCenter/FileMaterialMapper.xml +++ b/adc-da-slrs/src/main/resources/mybatis/mapper/fileMaterialCenter/FileMaterialMapper.xml @@ -16,4 +16,28 @@ id = #{id} + diff --git a/doc/sql/20220706_新表.sql b/doc/sql/20220706_新表.sql new file mode 100644 index 00000000..b33648ad --- /dev/null +++ b/doc/sql/20220706_新表.sql @@ -0,0 +1,24 @@ +CREATE TABLE `foton_slrs`.`Untitled` ( + `id` varchar(64) NULL COMMENT 'id', + `data_id` varchar(64) NULL COMMENT '数据id' +); + +ALTER TABLE `foton_slrs`.`file_material` +ADD COLUMN `is_show` varchar(255) NULL COMMENT '是否展示' AFTER `del_flag`; + + +SET NAMES utf8mb4; +SET FOREIGN_KEY_CHECKS = 0; + +-- ---------------------------- +-- Table structure for zl_tree +-- ---------------------------- +DROP TABLE IF EXISTS `zl_tree`; +CREATE TABLE `zl_tree` ( + `id` varchar(64) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL COMMENT '主键', + `p_id` varchar(64) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '父id', + `name` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '节点名称', + PRIMARY KEY (`id`) USING BTREE +) ENGINE = InnoDB CHARACTER SET = utf8mb4 COLLATE = utf8mb4_general_ci ROW_FORMAT = Dynamic; + +SET FOREIGN_KEY_CHECKS = 1; \ No newline at end of file