From 709ae560149c6ccc995d144ba2a0a6c048f3c9c3 Mon Sep 17 00:00:00 2001 From: xiejunyu Date: Mon, 7 Mar 2022 14:18:19 +0800 Subject: [PATCH] =?UTF-8?q?=E6=A0=87=E7=AD=BE=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../controller/OnlCgformTagController.java | 43 ++++--------------- .../tag/mapper/OnlCgformTagMapper.java | 7 +-- .../tag/service/IOnlCgformTagService.java | 7 +-- .../service/impl/OnlCgformTagServiceImpl.java | 25 +++++++++-- 4 files changed, 38 insertions(+), 44 deletions(-) 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 a84af5514..6e57573b3 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 @@ -1,14 +1,11 @@ package com.jero.modules.tag.controller; -import com.alibaba.fastjson.JSONArray; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; -import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.baomidou.mybatisplus.core.metadata.IPage; import com.jero.common.api.vo.Result; import com.jero.common.aspect.annotation.AutoLog; import com.jero.common.constant.CommonConstant; -import com.jero.common.constant.enums.CutEnum; import com.jero.common.system.base.controller.JeroController; -import com.jero.common.system.query.QueryGenerator; import com.jero.modules.enums.FixedFieldEnum; import com.jero.modules.system.service.impl.SysDictItemServiceImpl; import com.jero.modules.tag.entity.OnlCgformArea; @@ -53,16 +50,17 @@ public class OnlCgformTagController extends JeroController queryPageList(@RequestParam(name = "cut") String cut, + @PostMapping(value = "/page") + public Result queryPageList(@RequestBody Map params) { + QueryWrapper queryWrapper=new QueryWrapper<>(); + IPage pageList= onlCgformTagService.queryPageList(params); + return Result.OK(pageList); + } + /*public Result queryPageList(@RequestParam(name = "cut") String cut, OnlCgformTag onlCgformTag, @RequestParam(name="pageNo", defaultValue="1") Integer pageNo, @RequestParam(name="pageSize", defaultValue="10") Integer pageSize, @@ -84,32 +82,9 @@ public class OnlCgformTagController extends JeroController 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); - }*/ + }*/ /** * 表头中英文切换 * 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 0af1bfbbb..a3951c43c 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 @@ -1,11 +1,10 @@ package com.jero.modules.tag.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; import com.jero.modules.tag.entity.OnlCgformTag; import org.apache.ibatis.annotations.Select; +import org.springframework.data.repository.query.Param; import java.util.Map; @@ -26,7 +25,9 @@ public interface OnlCgformTagMapper extends BaseMapper { "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" + + "order by f.create_time desc\n" + "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); + IPage queryPageList(IPage page,@Param("params") Map params); +//IPage> 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 e22593615..f965c1bc2 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 @@ -1,7 +1,6 @@ package com.jero.modules.tag.service; -import com.baomidou.mybatisplus.core.conditions.Wrapper; -import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.baomidou.mybatisplus.core.metadata.IPage; import com.baomidou.mybatisplus.extension.service.IService; import com.jero.modules.tag.entity.OnlCgformArea; import com.jero.modules.tag.entity.OnlCgformTag; @@ -58,6 +57,8 @@ public interface IOnlCgformTagService extends IService { OnlCgformTag queryById(String id); + IPage queryPageList(Map params); + /** * 列表查询 * @@ -88,6 +89,6 @@ public interface IOnlCgformTagService extends IService { */ //List> queryCondition(String flag,String cut); - List> selectPageInfo(Page page, Wrapper queryWrapper); + //List> selectPageInfo(Page page, Wrapper queryWrapper); } 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 2e15c6478..dc014eb5c 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 @@ -1,11 +1,11 @@ package com.jero.modules.tag.service.impl; -import com.baomidou.mybatisplus.core.conditions.Wrapper; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; 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.generater.modules.online.cgform.service.impl.OnlCgformFieldServiceImpl; import com.jero.modules.tag.entity.OnlCgformArea; import com.jero.modules.tag.entity.OnlCgformTag; @@ -18,7 +18,6 @@ import org.springframework.stereotype.Service; import java.util.Date; import java.util.List; import java.util.Map; -import java.util.stream.Collectors; /** * @Description: 标签管理 @@ -96,6 +95,24 @@ public class OnlCgformTagServiceImpl extends ServiceImpl queryPageList(Map params) { + Integer pageNo = Integer.parseInt(params.get("pageNo").toString()); + Integer pageSize = Integer.parseInt(params.get("pageSize").toString()); + IPage page = new Page(pageNo, pageSize); + + //中英切换-属性类型+展示区域列 + if (CutEnum.CN.getValue().equals(params.get("cut").toString())) { + IPage result = onlCgformTagMapper.queryPageList(page,params); + return result; + } else { + params.put("fieldShowType", params.get("fieldShowTypeEnName")); + params.put("showArea",params.get("showAreaEnName")); + IPage result = onlCgformTagMapper.queryPageList(page,params); + return result; + } + + } /** * 列表查询 @@ -241,10 +258,10 @@ public class OnlCgformTagServiceImpl extends ServiceImpl> selectPageInfo(Page page, Wrapper queryWrapper) { IPage> info= onlCgformTagMapper.selectPageInfo(page, queryWrapper); List> list = info.getRecords().stream().collect(Collectors.toList()); return list; - } + }*/ }