diff --git a/jero-boot/jero-boot-module-system/src/main/java/com/jero/modules/system/controller/SysCategoryController.java b/jero-boot/jero-boot-module-system/src/main/java/com/jero/modules/system/controller/SysCategoryController.java index 37ebd4c8b..ca45459ce 100644 --- a/jero-boot/jero-boot-module-system/src/main/java/com/jero/modules/system/controller/SysCategoryController.java +++ b/jero-boot/jero-boot-module-system/src/main/java/com/jero/modules/system/controller/SysCategoryController.java @@ -108,7 +108,21 @@ public class SysCategoryController { } return Result.OK(sysCategory); } - + /**树形结构搜索条件-名称 + * + * @param + * @return + */ + @AutoLog(value = "标签内容-树形结构-通过sysDictId查询") + @ApiOperation(value="标签内容-树形结构-通过sysDictId查询", notes="标签内容-树形结构-通过sysDictId查询") + @GetMapping(value = "/queryBySysName") + public Result queryBySysName(@RequestParam(name="id",required=true) String sysName) { + List sysCategory = sysCategoryService.queryBySysName(sysName); + if(sysCategory==null) { + return Result.error("未找到对应数据"); + } + return Result.OK(sysCategory); + } /** * 添加 * @param sysCategory diff --git a/jero-boot/jero-boot-module-system/src/main/java/com/jero/modules/system/controller/SysDictController.java b/jero-boot/jero-boot-module-system/src/main/java/com/jero/modules/system/controller/SysDictController.java index 5166a1fd3..a53b8b6bf 100644 --- a/jero-boot/jero-boot-module-system/src/main/java/com/jero/modules/system/controller/SysDictController.java +++ b/jero-boot/jero-boot-module-system/src/main/java/com/jero/modules/system/controller/SysDictController.java @@ -1,6 +1,7 @@ package com.jero.modules.system.controller; +import com.alibaba.fastjson.JSONArray; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.core.metadata.IPage; @@ -8,6 +9,7 @@ import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.jero.common.api.vo.Result; import com.jero.common.constant.CacheConstant; import com.jero.common.constant.CommonConstant; +import com.jero.common.constant.enums.CutEnum; import com.jero.common.system.query.QueryGenerator; import com.jero.common.system.vo.DictModel; import com.jero.common.system.vo.LoginUser; @@ -71,7 +73,9 @@ public class SysDictController { @RequestMapping(value = "/page", method = RequestMethod.GET) @ApiOperation(value = "字典控制器-分页列表查询", notes = "字典控制器-分页列表查询") - public Result> queryPageList(SysDict sysDict, @RequestParam(name="pageNo", defaultValue="1") Integer pageNo, + public Result queryPageList(@RequestParam(name = "cut") String cut, + //public Result> queryPageList(@RequestParam(name = "cut") String cut, + SysDict sysDict, @RequestParam(name="pageNo", defaultValue="1") Integer pageNo, @RequestParam(name="pageSize", defaultValue="10") Integer pageSize, HttpServletRequest req) { Result> result = new Result>(); QueryWrapper queryWrapper = QueryGenerator.initQueryWrapper(sysDict, req.getParameterMap()); @@ -79,14 +83,31 @@ public class SysDictController { queryWrapper.orderByDesc("create_time"); } Page page = new Page(pageNo, pageSize); - IPage pageList = sysDictService.page(page, queryWrapper); + /* IPage pageList = sysDictService.page(page, queryWrapper); log.debug("查询当前页："+pageList.getCurrent()); log.debug("查询当前页数量："+pageList.getSize()); log.debug("查询结果数量："+pageList.getRecords().size()); log.debug("数据总数："+pageList.getTotal()); result.setSuccess(true); - result.setResult(pageList); - return result; + result.setResult(pageList);*/ + //中英切换-属性类型列 + List> pageList = sysDictService.selectPageInfo(page, queryWrapper); + if (CutEnum.CN.getValue().equals(cut)) { + return Result.OK(pageList); + } else { + JSONArray jsonArray = new JSONArray(); + jsonArray.addAll(pageList); + List list = jsonArray.toJavaList(SysDict.class); + list.stream().forEach(f -> f.setAttributeTypeName(f.getAttributeTypeEnName())); + + + /* String mid = String.valueOf(pageSize); + JSONArray json = JSONArray.parseArray(mid); + List aList = json.toJavaList(OnlCgformTag.class);*/ + //IPage p= (IPage) list;//list.addAll(aList) + return Result.OK(list); + } + //return result; } /** diff --git a/jero-boot/jero-boot-module-system/src/main/java/com/jero/modules/system/entity/SysDict.java b/jero-boot/jero-boot-module-system/src/main/java/com/jero/modules/system/entity/SysDict.java index 7dc0983b3..798fc8cff 100644 --- a/jero-boot/jero-boot-module-system/src/main/java/com/jero/modules/system/entity/SysDict.java +++ b/jero-boot/jero-boot-module-system/src/main/java/com/jero/modules/system/entity/SysDict.java @@ -1,6 +1,7 @@ package com.jero.modules.system.entity; import com.baomidou.mybatisplus.annotation.IdType; +import com.baomidou.mybatisplus.annotation.TableField; import com.baomidou.mybatisplus.annotation.TableId; import com.baomidou.mybatisplus.annotation.TableLogic; import com.jero.common.aspect.annotation.Dict; @@ -111,4 +112,17 @@ public class SysDict implements Serializable { @Dict(dicCode = "attribute_type") private java.lang.String attributeType; + /**属性类型名称*/ + @TableField(exist = false) + @Excel(name = "属性类型名称", width = 15,dictTable = "sys_dict_item", dicText = "item_text", dicCode ="item_text") + @Dict(dictTable = "sys_dict_item", dicText = "item_text", dicCode ="item_text") + @ApiModelProperty(value = "属性类型名称") + private java.lang.String attributeTypeName; + + /**数据字典英文名-属性类型英文名*/ + @TableField(exist = false) + @Excel(name = "属性类型英文名", width = 15,dictTable = "sys_dict_item", dicText = "en_name", dicCode ="en_name") + @Dict(dictTable = "sys_dict_item", dicText = "en_name", dicCode ="en_name") + @ApiModelProperty(value = "属性类型英文名") + private java.lang.String attributeTypeEnName; } \ No newline at end of file diff --git a/jero-boot/jero-boot-module-system/src/main/java/com/jero/modules/system/mapper/SysDictMapper.java b/jero-boot/jero-boot-module-system/src/main/java/com/jero/modules/system/mapper/SysDictMapper.java index 232297c31..c1ab0d92b 100644 --- a/jero-boot/jero-boot-module-system/src/main/java/com/jero/modules/system/mapper/SysDictMapper.java +++ b/jero-boot/jero-boot-module-system/src/main/java/com/jero/modules/system/mapper/SysDictMapper.java @@ -1,5 +1,6 @@ package com.jero.modules.system.mapper; +import com.baomidou.mybatisplus.core.conditions.Wrapper; import com.baomidou.mybatisplus.core.mapper.BaseMapper; import com.baomidou.mybatisplus.core.metadata.IPage; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; @@ -151,4 +152,16 @@ public interface SysDictMapper extends BaseMapper { */ @Deprecated public Page queryDictTablePageList(Page page, @Param("query") DictQuery query); + + + + @Select("select d.id,d.create_by,d.create_time,d.update_by,d.update_time,\n" + + "d.dict_name,d.dict_code,d.description,d.del_flag,d.type,\n" + + "d.dict_en_name,d.is_tag_dict,d.is_read_only,d.attribute_type as attribute_type_value,\n" + + "i.item_text as attribute_type_name,i.en_name as attribute_type_en_name\n" + + "\n" + + "from sys_dict as d\n" + + "left join sys_dict_item as i on d.attribute_type=i.item_value\n" + + "where i.dict_id=\"1494570247913512962\"") + IPage> selectPageInfo(Page page, Wrapper queryWrapper); } diff --git a/jero-boot/jero-boot-module-system/src/main/java/com/jero/modules/system/service/ISysCategoryService.java b/jero-boot/jero-boot-module-system/src/main/java/com/jero/modules/system/service/ISysCategoryService.java index 083e178db..02a03b7a9 100644 --- a/jero-boot/jero-boot-module-system/src/main/java/com/jero/modules/system/service/ISysCategoryService.java +++ b/jero-boot/jero-boot-module-system/src/main/java/com/jero/modules/system/service/ISysCategoryService.java @@ -71,4 +71,6 @@ public interface ISysCategoryService extends IService { * @return */ List getSysCategoryTree(); + + List queryBySysName(String sysName); } diff --git a/jero-boot/jero-boot-module-system/src/main/java/com/jero/modules/system/service/ISysDictService.java b/jero-boot/jero-boot-module-system/src/main/java/com/jero/modules/system/service/ISysDictService.java index fc04ce386..7ab4cccf1 100644 --- a/jero-boot/jero-boot-module-system/src/main/java/com/jero/modules/system/service/ISysDictService.java +++ b/jero-boot/jero-boot-module-system/src/main/java/com/jero/modules/system/service/ISysDictService.java @@ -1,5 +1,7 @@ package com.jero.modules.system.service; +import com.baomidou.mybatisplus.core.conditions.Wrapper; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.baomidou.mybatisplus.extension.service.IService; import com.jero.common.system.vo.DictModel; import com.jero.common.system.vo.DictQuery; @@ -159,4 +161,5 @@ public interface ISysDictService extends IService { */ Integer queryExitData(SysDict sysDict); + List> selectPageInfo(Page page, Wrapper queryWrapper); } diff --git a/jero-boot/jero-boot-module-system/src/main/java/com/jero/modules/system/service/impl/SysCategoryServiceImpl.java b/jero-boot/jero-boot-module-system/src/main/java/com/jero/modules/system/service/impl/SysCategoryServiceImpl.java index db051dbcd..5ec5fb25e 100644 --- a/jero-boot/jero-boot-module-system/src/main/java/com/jero/modules/system/service/impl/SysCategoryServiceImpl.java +++ b/jero-boot/jero-boot-module-system/src/main/java/com/jero/modules/system/service/impl/SysCategoryServiceImpl.java @@ -6,7 +6,6 @@ import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper; import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; -import com.jero.common.api.vo.Result; import com.jero.common.constant.FillRuleConstant; import com.jero.common.exception.JeroBootException; import com.jero.common.util.FillRuleUtil; @@ -220,6 +219,12 @@ public class SysCategoryServiceImpl extends ServiceImpl queryBySysName(String sysName) { + QueryWrapper queryWrapper=new QueryWrapper<>(); + queryWrapper.like("name",sysName); + return list(queryWrapper); + } @Override public List getSysCategoryTree() { try { @@ -234,4 +239,6 @@ public class SysCategoryServiceImpl extends ServiceImpl impl return count; } - + @Override + public List> selectPageInfo(Page page, Wrapper queryWrapper) { + IPage> info= sysDictMapper.selectPageInfo(page, queryWrapper); + List> list = info.getRecords().stream().collect(Collectors.toList()); + return list; + } } diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/tag/controller/OnlCgformAreaController.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/tag/controller/OnlCgformAreaController.java index d3330dd48..11ce06f04 100644 --- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/tag/controller/OnlCgformAreaController.java +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/tag/controller/OnlCgformAreaController.java @@ -85,14 +85,14 @@ public class OnlCgformAreaController extends JeroController>> getHeader(@RequestParam(name = "flag") String flag, @RequestParam(name = "cut") String cut) { List> list =onlCgformAreaService.getHeader(flag, cut); return Result.OK(list); - } + }*/ /** * 列表查询 diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/tag/controller/OnlCgformTagController.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/tag/controller/OnlCgformTagController.java index d144b8d08..184d13ae3 100644 --- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/tag/controller/OnlCgformTagController.java +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/tag/controller/OnlCgformTagController.java @@ -84,37 +84,59 @@ public class OnlCgformTagController extends JeroController list = jsonArray.toJavaList(OnlCgformTag.class); list.stream().forEach(f -> f.setFieldShowType(f.getFieldShowTypeEnName())); list.stream().forEach(s->s.setShowArea(s.getShowAreaEnName())); + + /* String mid = String.valueOf(pageSize); + JSONArray json = JSONArray.parseArray(mid); + List aList = json.toJavaList(OnlCgformTag.class);*/ + //IPage p= (IPage) list;//list.addAll(aList) return Result.OK(list); } } +/* +* //中英切换-属性类型列+展示区域列 + List> pageList = onlCgformTagService.selectPageInfo(page, queryWrapper); + if (CutEnum.CN.getValue().equals(cut)) { + return Result.OK(pageList); + } else { + JSONArray jsonArray = new JSONArray(); + jsonArray.addAll(pageList); + + String reset=LineHumpUtil.humpToLine2(jsonArray.toString()); + JSONArray jsonArray2= JSONArray.parseArray(reset); + List list = jsonArray2.toJavaList(OnlCgformTag.class); + + list.stream().forEach(f -> f.setFieldShowType(f.getFieldShowTypeEnName())); + list.stream().forEach(s->s.setShowArea(s.getShowAreaEnName())); + return Result.OK(list); + }*/ /** * 表头中英文切换 * * @return */ - @AutoLog(value = "标签管理-表头中英文切换") + /*@AutoLog(value = "标签管理-表头中英文切换") @ApiOperation(value="标签管理-表头中英文切换", notes="标签管理-表头中英文切换") @GetMapping(value = "/getHeader") public Result>> getHeader(@RequestParam(name = "flag") String flag, @RequestParam(name = "cut") String cut) { List> list =onlCgformTagService.getHeader(flag,cut); return Result.OK(list); - } + }*/ /** * 查询条件中英文切换 * * @return */ - @AutoLog(value = "标签管理-查询条件中英文切换") + /*@AutoLog(value = "标签管理-查询条件中英文切换") @ApiOperation(value="标签管理-查询条件中英文切换", notes="标签管理-查询条件中英文切换") @GetMapping(value = "/queryCondition") public Result>> queryCondition(@RequestParam(name = "flag") String flag, @RequestParam(name = "cut") String cut) { List> list = onlCgformTagService.queryCondition(flag,cut); return Result.OK(list); - } + }*/ /** * 列表查询 @@ -150,8 +172,8 @@ public class OnlCgformTagController extends JeroController { - @Select("select a.id,a.create_by,a.create_time,a.update_by,\n" + - "a.update_time,a.en_name,i.en_name as model_en_name\n" + + @Select("select a.id,a.create_by,a.create_time,a.update_by,a.update_time,\n" + + "a.is_model,i.item_text,a.show_area,a.sort,a.en_name,i.en_name as model_en_name\n" + "from onl_cgform_area as a left join sys_dict_item as i \n" + "on a.is_model=i.item_value \n" + "where i.dict_id=1493096744092102657 order by a.create_time desc") diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/tag/mapper/OnlCgformTagMapper.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/tag/mapper/OnlCgformTagMapper.java index d0f3734f4..0af1bfbbb 100644 --- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/tag/mapper/OnlCgformTagMapper.java +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/tag/mapper/OnlCgformTagMapper.java @@ -16,18 +16,17 @@ import java.util.Map; * @Version: V1.0 */ public interface OnlCgformTagMapper extends BaseMapper { - - @Select("select f.id,f.create_by,f.create_time,f.update_by,f.update_time,f.cgform_head_id,\n" + - "f.is_model,f.db_field_txt,f.db_field_en_name,f.field_show_type,f.dict_id,f.db_length,\n" + + "f.is_model,f.db_field_txt,f.db_field_en_name,\n" + + "f.field_show_type,i.item_text,f.dict_id,f.db_length,\n" + "f.order_num,f.field_must_input,f.is_show_form,f.is_show_list,\n" + - "f.is_read_only,f.show_area,f.is_query,f.is_show_laws_list,f.is_show_search,f.is_delete,\n" + + "f.is_read_only,f.show_area as area_id,a.show_area,f.is_query,f.is_show_laws_list,f.is_show_search,f.is_delete,\n" + "f.db_field_name,f.db_is_key,f.db_is_null,f.db_point_length,f.db_type,\n" + "i.en_name as field_show_type_en_name,a.en_name as show_area_en_name\n" + "from onl_cgform_field as f \n" + "left join sys_dict_item as i on f.field_show_type=i.item_value\n" + "left join onl_cgform_area as a on f.show_area=a.id\n" + - "where f.cgform_head_id=\"48308196e7b04761b533dc31bc899707\"\n" + - "and i.dict_id=1493098515761917954 order by f.create_time desc") + "where f.cgform_head_id=\"48308196e7b04761b533dc31bc899707\" \n" + + "and i.dict_id=1493098515761917954 order by f.create_time desc\n") IPage> selectPageInfo(Page page, Wrapper queryWrapper); } diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/tag/service/IOnlCgformAreaService.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/tag/service/IOnlCgformAreaService.java index 43d103bab..e43a858ad 100644 --- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/tag/service/IOnlCgformAreaService.java +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/tag/service/IOnlCgformAreaService.java @@ -80,11 +80,9 @@ public interface IOnlCgformAreaService extends IService { /** * 列表表头中英文切换 - * @param flag - * @param cut * @return */ - public List> getHeader(String flag, String cut); + //public List> getHeader(String flag, String cut); List> selectPageInfo(Page page, Wrapper queryWrapper); } diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/tag/service/IOnlCgformTagService.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/tag/service/IOnlCgformTagService.java index 4008b3f55..e22593615 100644 --- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/tag/service/IOnlCgformTagService.java +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/tag/service/IOnlCgformTagService.java @@ -79,14 +79,14 @@ public interface IOnlCgformTagService extends IService { * @param cut * @return */ - List> getHeader(String flag, String cut); + //List> getHeader(String flag, String cut); /** * 查询条件中英文切换 - * @param cut + * @param * @return */ - List> queryCondition(String flag,String cut); + //List> queryCondition(String flag,String cut); List> selectPageInfo(Page page, Wrapper queryWrapper); diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/tag/service/impl/OnlCgformAreaServiceImpl.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/tag/service/impl/OnlCgformAreaServiceImpl.java index bfa5498c5..6dbd6e41d 100644 --- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/tag/service/impl/OnlCgformAreaServiceImpl.java +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/tag/service/impl/OnlCgformAreaServiceImpl.java @@ -7,10 +7,7 @@ import com.baomidou.mybatisplus.core.metadata.IPage; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import com.jero.common.constant.enums.CutEnum; -import com.jero.common.constant.enums.YesOrNoEnum; -import com.jero.generater.modules.online.cgform.entity.OnlCgformField; import com.jero.generater.modules.online.cgform.service.impl.OnlCgformFieldServiceImpl; -import com.jero.modules.ocr.util.LineHumpUtil; import com.jero.modules.tag.entity.OnlCgformArea; import com.jero.modules.tag.mapper.OnlCgformAreaMapper; import com.jero.modules.tag.service.IOnlCgformAreaService; @@ -18,7 +15,9 @@ import org.apache.commons.lang3.StringUtils; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; -import java.util.*; +import java.util.Date; +import java.util.List; +import java.util.Map; import java.util.stream.Collectors; /** @@ -33,7 +32,10 @@ public class OnlCgformAreaServiceImpl extends ServiceImpl> getHeader(String flag, String cut) { List fieldList = onlCgformFieldService.getFieldList(flag); if (fieldList.size() != 0) { @@ -169,13 +171,12 @@ public class OnlCgformAreaServiceImpl extends ServiceImpl> selectPageInfo(Page page, Wrapper queryWrapper) { - IPage> info= (IPage>) onlCgformAreaMapper.selectPageInfo(page, queryWrapper); + IPage> info=onlCgformAreaMapper.selectPageInfo(page, queryWrapper); List> list = info.getRecords().stream().collect(Collectors.toList()); - System.out.println("这里这里"+list); return list; } } \ No newline at end of file diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/tag/service/impl/OnlCgformTagServiceImpl.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/tag/service/impl/OnlCgformTagServiceImpl.java index a13654750..2e15c6478 100644 --- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/tag/service/impl/OnlCgformTagServiceImpl.java +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/tag/service/impl/OnlCgformTagServiceImpl.java @@ -6,8 +6,6 @@ import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper; import com.baomidou.mybatisplus.core.metadata.IPage; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; -import com.jero.common.constant.enums.CutEnum; -import com.jero.common.constant.enums.ModuleEnum; import com.jero.generater.modules.online.cgform.service.impl.OnlCgformFieldServiceImpl; import com.jero.modules.tag.entity.OnlCgformArea; import com.jero.modules.tag.entity.OnlCgformTag; @@ -17,7 +15,9 @@ import org.apache.commons.lang3.StringUtils; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; -import java.util.*; +import java.util.Date; +import java.util.List; +import java.util.Map; import java.util.stream.Collectors; /** @@ -134,7 +134,7 @@ public class OnlCgformTagServiceImpl extends ServiceImpl queryWrapper = new LambdaQueryWrapper<>(); if (StringUtils.isNotBlank(onlCgformArea.getShowArea())) { - queryWrapper.eq(OnlCgformTag::getShowArea,onlCgformArea.getShowArea()); + queryWrapper.eq(OnlCgformTag::getShowArea,onlCgformArea.getId()); } Integer count = onlCgformTagMapper.selectCount(queryWrapper); return count; @@ -144,7 +144,7 @@ public class OnlCgformTagServiceImpl extends ServiceImpl> getHeader(String flag, String cut) { List> list = new ArrayList<>(); Map map1 = new HashMap<>(); @@ -211,13 +211,13 @@ public class OnlCgformTagServiceImpl extends ServiceImpl> queryCondition(String flag, String cut) { List> list = new ArrayList<>(); Map map1 = new HashMap<>(); @@ -239,15 +239,12 @@ public class OnlCgformTagServiceImpl extends ServiceImpl> selectPageInfo(Page page, Wrapper queryWrapper) { IPage> info= onlCgformTagMapper.selectPageInfo(page, queryWrapper); List> list = info.getRecords().stream().collect(Collectors.toList()); - System.out.println("这里这里"+list); return list; } - - }