From eb8febe8252f8b7e38054c88a0cd3a66edd0fd47 Mon Sep 17 00:00:00 2001 From: xiejunyu Date: Sun, 6 Mar 2022 13:24:15 +0800 Subject: [PATCH] =?UTF-8?q?=E6=A0=87=E7=AD=BE=E5=88=97=E8=A1=A8+=E6=96=B0?= =?UTF-8?q?=E5=A2=9E=E9=A1=B5+=E5=B1=95=E7=A4=BA=E5=8C=BA=E5=9F=9F-?= =?UTF-8?q?=E4=B8=AD=E8=8B=B1=E5=88=87=E6=8D=A2=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../service/impl/SysDictServiceImpl.java | 8 ++-- .../controller/OnlCgformAreaController.java | 19 ++++++-- .../controller/OnlCgformTagController.java | 48 ++++++++++++++----- .../jero/modules/tag/entity/OnlCgformTag.java | 15 +++++- .../tag/mapper/OnlCgformAreaMapper.java | 13 ++++- .../tag/mapper/OnlCgformTagMapper.java | 19 ++++++++ .../tag/service/IOnlCgformAreaService.java | 19 ++++---- .../tag/service/IOnlCgformTagService.java | 21 ++++---- .../impl/OnlCgformAreaServiceImpl.java | 14 ++++++ .../service/impl/OnlCgformTagServiceImpl.java | 42 ++++++++++------ 10 files changed, 165 insertions(+), 53 deletions(-) diff --git a/jero-boot/jero-boot-module-system/src/main/java/com/jero/modules/system/service/impl/SysDictServiceImpl.java b/jero-boot/jero-boot-module-system/src/main/java/com/jero/modules/system/service/impl/SysDictServiceImpl.java index 8f982f0f4..b9a54b36a 100644 --- a/jero-boot/jero-boot-module-system/src/main/java/com/jero/modules/system/service/impl/SysDictServiceImpl.java +++ b/jero-boot/jero-boot-module-system/src/main/java/com/jero/modules/system/service/impl/SysDictServiceImpl.java @@ -200,13 +200,13 @@ public class SysDictServiceImpl extends ServiceImpl impl QueryWrapper queryWrapper = new QueryWrapper<>(); if (CutEnum.CN.getValue().equals(cut)) { queryWrapper.select("id", "dict_name","dict_en_name", "attribute_type").eq("is_tag_dict", 1); + return list(queryWrapper); }else{ queryWrapper.select("id", "dict_name","dict_en_name", "attribute_type").eq("is_tag_dict", 1); - List resetlist = list(queryWrapper); - resetlist.stream().forEach(f->f.setDictName(f.getDictEnName())); - return resetlist; + List resetList = list(queryWrapper); + resetList.stream().forEach(f->f.setDictName(f.getDictEnName())); + return resetList; } - return list(queryWrapper); } /** 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 79271b776..d3330dd48 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 @@ -1,10 +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.core.metadata.IPage; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.jero.common.api.vo.Result; import com.jero.common.aspect.annotation.AutoLog; +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.system.service.ISysDictItemService; @@ -56,7 +57,8 @@ public class OnlCgformAreaController extends JeroController queryPageList(OnlCgformArea onlCgformArea, + public Result queryPageList(@RequestParam(name = "cut") String cut, + OnlCgformArea onlCgformArea, @RequestParam(name="pageNo", defaultValue="1") Integer pageNo, @RequestParam(name="pageSize", defaultValue="10") Integer pageSize, HttpServletRequest req) { @@ -65,8 +67,17 @@ public class OnlCgformAreaController extends JeroController pageList = onlCgformAreaService.page(page, queryWrapper); - return Result.OK(pageList); + //中英切换-所属模块列 + List> pageList = onlCgformAreaService.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(OnlCgformArea.class); + list.stream().forEach(f -> f.setIsModel(f.getEnName())); + 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 a8abeebb1..d144b8d08 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,17 +1,20 @@ package com.jero.modules.tag.controller; +import com.alibaba.fastjson.JSONArray; 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.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; import com.jero.modules.tag.entity.OnlCgformTag; import com.jero.modules.tag.service.IOnlCgformTagService; +import com.jero.modules.utils.HanYuPinYinUtil; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; import lombok.extern.slf4j.Slf4j; @@ -45,7 +48,8 @@ public class OnlCgformTagController extends JeroController queryPageList(OnlCgformTag onlCgformTag, + public Result queryPageList(@RequestParam(name = "cut") String cut, + OnlCgformTag onlCgformTag, @RequestParam(name="pageNo", defaultValue="1") Integer pageNo, @RequestParam(name="pageSize", defaultValue="10") Integer pageSize, HttpServletRequest req) { + QueryWrapper queryWrapper = QueryGenerator.initQueryWrapper(onlCgformTag, req.getParameterMap()); Page page = new Page(pageNo, pageSize); - if(StringUtils.isNotBlank("create_time")) { - queryWrapper.orderByDesc("create_time") - .eq("cgform_head_id","48308196e7b04761b533dc31bc899707");//筛选文档库数据 + if (StringUtils.isNotBlank("create_time")) { + queryWrapper.orderByDesc("create_time").eq("is_show_list", 1) + .eq("cgform_head_id", "48308196e7b04761b533dc31bc899707");//筛选文档库数据 + } + //中英切换-属性类型列 + List> pageList = onlCgformTagService.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(OnlCgformTag.class); + list.stream().forEach(f -> f.setFieldShowType(f.getFieldShowTypeEnName())); + list.stream().forEach(s->s.setShowArea(s.getShowAreaEnName())); + return Result.OK(list); } - IPage pageList = onlCgformTagService.page(page, queryWrapper); - return Result.OK(pageList); } /** @@ -80,9 +96,9 @@ public class OnlCgformTagController extends JeroController>> getHeader(@RequestParam(name = "flag") String flag, - @RequestParam(name = "cut") String cut) { - List> list =onlCgformTagService.getHeader(flag,cut); + public Result>> getHeader(@RequestParam(name = "flag") String flag, + @RequestParam(name = "cut") String cut) { + List> list =onlCgformTagService.getHeader(flag,cut); return Result.OK(list); } @@ -94,9 +110,9 @@ public class OnlCgformTagController extends JeroController>> queryCondition(@RequestParam(name = "flag") String flag, + public Result>> queryCondition(@RequestParam(name = "flag") String flag, @RequestParam(name = "cut") String cut) { - List> list = onlCgformTagService.queryCondition(flag,cut); + List> list = onlCgformTagService.queryCondition(flag,cut); return Result.OK(list); } @@ -130,6 +146,12 @@ 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" + + "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") + IPage> selectPageInfo(Page page, Wrapper queryWrapper); } 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 7fe6a7bd7..d0f3734f4 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,7 +1,13 @@ 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 java.util.Map; /** * @Description: 标签管理 @@ -11,4 +17,17 @@ import com.jero.modules.tag.entity.OnlCgformTag; */ 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.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.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") + 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 f86bd0626..43d103bab 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 @@ -1,5 +1,7 @@ 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.extension.service.IService; import com.jero.modules.tag.entity.OnlCgformArea; @@ -20,7 +22,7 @@ public interface IOnlCgformAreaService extends IService { * @param onlCgformArea * @return */ - void add(OnlCgformArea onlCgformArea); + void add(OnlCgformArea onlCgformArea); /** * 更新 @@ -28,7 +30,7 @@ public interface IOnlCgformAreaService extends IService { * @param onlCgformArea * @return */ - void editById(OnlCgformArea onlCgformArea); + void editById(OnlCgformArea onlCgformArea); /** * 通过id删除 @@ -36,7 +38,7 @@ public interface IOnlCgformAreaService extends IService { * @param id * @return */ - void deleteById(String id); + void deleteById(String id); /** * 批量删除 @@ -44,7 +46,7 @@ public interface IOnlCgformAreaService extends IService { * @param ids * @return */ - void deleteByIds(List ids); + void deleteByIds(List ids); /** * 通过id查询 @@ -52,14 +54,14 @@ public interface IOnlCgformAreaService extends IService { * @param id * @return */ - OnlCgformArea queryById(String id); + OnlCgformArea queryById(String id); - /** + /** * 列表查询 * * @return */ - List queryList(OnlCgformArea onlCgformArea); + List queryList(OnlCgformArea onlCgformArea); /** * 查询展示区域 @@ -68,7 +70,7 @@ public interface IOnlCgformAreaService extends IService { */ List queryShowArea(String cut, OnlCgformArea onlCgformArea); - /** + /** * 展示区域查询 * * @param id @@ -84,4 +86,5 @@ public interface IOnlCgformAreaService extends IService { */ 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 e433d9551..4008b3f55 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,5 +1,7 @@ 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.extension.service.IService; import com.jero.modules.tag.entity.OnlCgformArea; import com.jero.modules.tag.entity.OnlCgformTag; @@ -21,7 +23,7 @@ public interface IOnlCgformTagService extends IService { * @param onlCgformTag * @return */ - void add(OnlCgformTag onlCgformTag); + void add(OnlCgformTag onlCgformTag); /** * 更新 @@ -29,7 +31,7 @@ public interface IOnlCgformTagService extends IService { * @param onlCgformTag * @return */ - void editById(OnlCgformTag onlCgformTag); + void editById(OnlCgformTag onlCgformTag); /** * 通过id删除 @@ -37,7 +39,7 @@ public interface IOnlCgformTagService extends IService { * @param id * @return */ - void deleteById(String id); + void deleteById(String id); /** * 批量删除 @@ -45,7 +47,7 @@ public interface IOnlCgformTagService extends IService { * @param ids * @return */ - void deleteByIds(List ids); + void deleteByIds(List ids); /** * 通过id查询 @@ -53,7 +55,7 @@ public interface IOnlCgformTagService extends IService { * @param id * @return */ - OnlCgformTag queryById(String id); + OnlCgformTag queryById(String id); /** @@ -61,7 +63,7 @@ public interface IOnlCgformTagService extends IService { * * @return */ - List queryList(OnlCgformArea onlCgformArea); + List queryList(OnlCgformArea onlCgformArea); /** * 根据所属模块、属性名称、英文名称是否一致还原数据 @@ -77,12 +79,15 @@ public interface IOnlCgformTagService extends IService { * @param cut * @return */ - List> getHeader(String flag,String cut); + List> getHeader(String flag, String cut); /** * 查询条件中英文切换 * @param cut * @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 3d541057b..bfa5498c5 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 @@ -1,7 +1,10 @@ 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.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 com.jero.common.constant.enums.CutEnum; import com.jero.common.constant.enums.YesOrNoEnum; @@ -28,6 +31,9 @@ import java.util.stream.Collectors; public class OnlCgformAreaServiceImpl extends ServiceImpl implements IOnlCgformAreaService { @Autowired private OnlCgformFieldServiceImpl onlCgformFieldService; + + @Autowired + private OnlCgformAreaServiceImpl onlCgformAreaMapper; /** * 保存 * @@ -164,4 +170,12 @@ public class OnlCgformAreaServiceImpl extends ServiceImpl> selectPageInfo(Page page, Wrapper queryWrapper) { + IPage> info= (IPage>) 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 64e19e497..a13654750 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,7 +1,10 @@ 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.common.constant.enums.ModuleEnum; @@ -15,6 +18,7 @@ import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; import java.util.*; +import java.util.stream.Collectors; /** * @Description: 标签管理 @@ -141,14 +145,14 @@ public class OnlCgformTagServiceImpl extends ServiceImpl> getHeader(String flag,String cut) { - List> list = new ArrayList<>(); - Map map1 = new HashMap<>(); - Map map2 = new HashMap<>(); - Map map3 = new HashMap<>(); - Map map4 = new HashMap<>(); - Map map5 = new HashMap<>(); - Map map6 = new HashMap<>(); + public List> getHeader(String flag, String cut) { + List> list = new ArrayList<>(); + Map map1 = new HashMap<>(); + Map map2 = new HashMap<>(); + Map map3 = new HashMap<>(); + Map map4 = new HashMap<>(); + Map map5 = new HashMap<>(); + Map map6 = new HashMap<>(); if (ModuleEnum.ONL_CGFORM_TAG.getValue().equals(flag)) { System.out.println("走的flag=3"); if (CutEnum.CN.getValue().equals(cut)) { @@ -214,12 +218,12 @@ public class OnlCgformTagServiceImpl extends ServiceImpl> queryCondition(String flag, String cut) { - List> list = new ArrayList<>(); - Map map1 = new HashMap<>(); - Map map2 = new HashMap<>(); + public List> queryCondition(String flag, String cut) { + List> list = new ArrayList<>(); + Map map1 = new HashMap<>(); + Map map2 = new HashMap<>(); if (CutEnum.CN.getValue().equals(cut)) { - map2= (Map) onlCgformAreaService.queryShowArea(cut,onlCgformArea); + // map2= (Map) onlCgformAreaService.queryShowArea(cut,onlCgformArea); map1.put("db_field_name", "show_area");//字段 map1.put("db_field_txt", "展示区域");//字段中文名 map1.put("value", String.valueOf(map2)); @@ -227,7 +231,7 @@ public class OnlCgformTagServiceImpl extends ServiceImpl) onlCgformAreaService.queryShowArea(cut,onlCgformArea); + //map2= (Map) onlCgformAreaService.queryShowArea(cut,onlCgformArea); map1.put("db_field_name", "show_area");//字段 map1.put("db_field_txt", "display area");//字段英文名 map1.put("value", String.valueOf(map2)); @@ -236,4 +240,14 @@ 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; + } + + }