From 0f102d9be7f510b3484d1c92a4387c7c3870ffbc Mon Sep 17 00:00:00 2001 From: xiejunyu Date: Thu, 3 Mar 2022 16:08:25 +0800 Subject: [PATCH] =?UTF-8?q?=E6=A0=87=E7=AD=BE=E9=A1=B9-=E4=B8=AD=E8=8B=B1?= =?UTF-8?q?=E5=88=87=E6=8D=A2?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../controller/OnlCgformAreaController.java | 31 ++-- .../controller/OnlCgformTagController.java | 12 +- .../tag/service/IOnlCgformAreaService.java | 11 +- .../tag/service/IOnlCgformTagService.java | 14 +- .../impl/OnlCgformAreaServiceImpl.java | 54 ++---- .../service/impl/OnlCgformTagServiceImpl.java | 166 +++++++++--------- 6 files changed, 120 insertions(+), 168 deletions(-) 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 b77a58ff8..0234b245f 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 @@ -7,11 +7,13 @@ import com.jero.common.api.vo.Result; import com.jero.common.aspect.annotation.AutoLog; import com.jero.common.system.base.controller.JeroController; import com.jero.common.system.query.QueryGenerator; +import com.jero.modules.system.service.ISysDictItemService; import com.jero.modules.tag.entity.OnlCgformArea; import com.jero.modules.tag.service.IOnlCgformAreaService; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; import lombok.extern.slf4j.Slf4j; +import org.apache.commons.lang3.StringUtils; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.validation.annotation.Validated; import org.springframework.web.bind.annotation.*; @@ -37,8 +39,8 @@ import java.util.Map; public class OnlCgformAreaController extends JeroController { @Autowired private IOnlCgformAreaService onlCgformAreaService; - //TODO 这里不允许定义变量 - + @Autowired + private ISysDictItemService sysDictItemService; /** * 分页列表查询 * @@ -57,6 +59,9 @@ public class OnlCgformAreaController extends JeroController queryWrapper = QueryGenerator.initQueryWrapper(onlCgformArea, req.getParameterMap()); Page page = new Page(pageNo, pageSize); + if(StringUtils.isNotBlank("create_time")) { + queryWrapper.orderByDesc("create_time"); + } IPage pageList = onlCgformAreaService.page(page, queryWrapper); return Result.OK(pageList); } @@ -66,8 +71,8 @@ public class OnlCgformAreaController extends JeroController>> getHeader(@RequestParam(name = "flag") String flag, @RequestParam(name = "cut") String cut) { @@ -75,20 +80,6 @@ public class OnlCgformAreaController extends JeroController>> queryCondition(@RequestParam(name = "flag") String flag, - @RequestParam(name = "cut") String cut) { - List> list = onlCgformAreaService.queryCondition(flag, cut); - return Result.OK(list); - } - /** * 列表查询 * @@ -107,8 +98,8 @@ public class OnlCgformAreaController extends JeroController> queryShowArea(OnlCgformArea onlCgformArea){ List list = onlCgformAreaService.queryShowArea(onlCgformArea); 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 ba8717314..c4d31fdae 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 @@ -78,9 +78,8 @@ 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 = "cut") String cut) { + List> list =onlCgformTagService.getHeader(cut); return Result.OK(list); } @@ -90,11 +89,10 @@ public class OnlCgformTagController extends JeroController>> queryCondition(@RequestParam(name = "flag") String flag, - @RequestParam(name = "cut") String cut) { - List> list = onlCgformTagService.queryCondition(flag, cut); + public Result>> queryCondition(@RequestParam(name = "cut") String cut) { + List> list = onlCgformTagService.queryCondition(cut); return Result.OK(list); } 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 b875e4608..66aa67498 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 @@ -68,7 +68,9 @@ public interface IOnlCgformAreaService extends IService { */ List queryShowArea(OnlCgformArea onlCgformArea); - /** + List queryShowAreaEnName(OnlCgformArea onlCgformArea); + + /** * 展示区域查询 * * @param id @@ -84,11 +86,4 @@ public interface IOnlCgformAreaService extends IService { */ public List> getHeader(String flag, String cut); - /** - * 查询条件中英文切换 - * @param flag - * @param cut - * @return - */ - public List> queryCondition(String flag, String cut); } 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 c95304097..924eccca7 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 @@ -72,25 +72,17 @@ public interface IOnlCgformTagService extends IService { /** * 列表表头中英文切换 - * @param flag * @param cut * @return */ - List> getHeader(String flag, String cut); + List> getHeader(String cut); /** * 查询条件中英文切换 - * @param flag * @param cut * @return */ - List> queryCondition(String flag, String cut); + List> queryCondition(String cut); + - /** - * 表单中英文切换 - * @param flag - * @param cut - * @return - */ - List> getForm(String flag, String cut); } 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 9d6fff918..5b4caee70 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 @@ -116,7 +116,14 @@ public class OnlCgformAreaServiceImpl extends ServiceImpl queryShowAreaEnName(OnlCgformArea onlCgformArea) { + QueryWrapper QueryWrapper = new QueryWrapper<>(); + if(StringUtils.isNotBlank(onlCgformArea.getIsModel())){ + QueryWrapper.select("id","en_name").orderByAsc("sort"); + } + return list(QueryWrapper); + } /** * 展示区域查询 * @@ -136,20 +143,18 @@ public class OnlCgformAreaServiceImpl extends ServiceImpl> getHeader(String flag, String cut) { List fieldList = onlCgformFieldService.getFieldList(flag); if (fieldList.size() != 0) { - //过滤列表字段(is_show_list-->列表是否显示0否 1是) - fieldList = fieldList.stream().filter(e -> YesOrNoEnum.YES.getValue().equals(String.valueOf(e.getIsShowList()))).collect(Collectors.toList()); + fieldList = fieldList.stream().filter( + e -> YesOrNoEnum.YES.getValue().equals(String.valueOf(e.getIsShowList())) + && ( + e.getDbFieldEnName().equals("display area")||e.getDbFieldEnName().equals("belonging module") + ||e.getDbFieldEnName().equals("sort number")||e.getDbFieldEnName().equals("state") + ) + ).collect(Collectors.toList()); } List> list = new ArrayList<>(); for (OnlCgformField onlCgformField : fieldList) { Map map = new HashMap<>(); - if ("file_name".equals(onlCgformField.getDbFieldName())) { - //跳转详情的标识 - map.put("click", "true"); - } - //单独处理发布日期和标准实施日期 - if ("update_time".equals(onlCgformField.getDbFieldName())) { - map.put("sort", "true");//列表排序标识 - } + map.put("db_field_name", LineHumpUtil.lineToHump(onlCgformField.getDbFieldName()));//字段 if (CutEnum.CN.getValue().equals(cut)) { map.put("db_field_txt", onlCgformField.getDbFieldTxt());//字段中文名 @@ -161,31 +166,4 @@ public class OnlCgformAreaServiceImpl extends ServiceImpl> queryCondition(String flag, String cut) { - List fieldList = onlCgformFieldService.getFieldList(flag); - if (fieldList.size() != 0) { - //过滤出搜索条件() - fieldList = fieldList.stream().filter(e -> YesOrNoEnum.YES.getValue().equals(String.valueOf(e.getIsQuery()))).collect(Collectors.toList()); - } - List> list = new ArrayList<>(); - for (OnlCgformField onlCgformField : fieldList) { - Map map = new HashMap<>(); - map.put("field_show_type", onlCgformField.getFieldShowType());//类型(判断是下拉还是输入框,等等) - map.put("dict_field", onlCgformField.getDictField()); //下拉类型的数据字典编码 - map.put("db_field_name", LineHumpUtil.lineToHump(onlCgformField.getDbFieldName()));//字段 - if (CutEnum.CN.getValue().equals(cut)) { - map.put("db_field_txt", onlCgformField.getDbFieldTxt());//字段中文名 - } else { - map.put("db_field_txt", onlCgformField.getDbFieldEnName());//字段英文名 - } - list.add(map); - } - 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 3ca726b32..deb1585db 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 @@ -4,10 +4,7 @@ import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper; 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.entity.OnlCgformTag; import com.jero.modules.tag.mapper.OnlCgformTagMapper; @@ -17,7 +14,6 @@ import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; import java.util.*; -import java.util.stream.Collectors; /** * @Description: 标签管理 @@ -31,6 +27,8 @@ public class OnlCgformTagServiceImpl extends ServiceImpl queryWrapper = new LambdaQueryWrapper<>(); - if (StringUtils.isNotBlank(onlCgformTag.getIsModel())) {// && StringUtils.isNotBlank(onlCgformTag.getDbFieldName())) { - queryWrapper.eq(OnlCgformTag::getIsModel, onlCgformTag.getIsModel()).and(wq -> wq.eq(OnlCgformTag::getDbFieldTxt, onlCgformTag.getDbFieldTxt())); + if (StringUtils.isNotBlank(onlCgformTag.getIsModel())) { + queryWrapper.eq(OnlCgformTag::getIsModel, onlCgformTag.getIsModel()).eq(OnlCgformTag::getDbFieldTxt, onlCgformTag.getDbFieldTxt()) + .eq(OnlCgformTag::getDbFieldEnName, onlCgformTag.getDbFieldEnName()); } Integer count = onlCgformTagMapper.selectCount(queryWrapper); return count; @@ -127,95 +126,94 @@ public class OnlCgformTagServiceImpl extends ServiceImpl> getHeader(String flag, String cut) { - List fieldList = onlCgformFieldService.getFieldList(flag); - if (fieldList.size() != 0) { - //过滤列表字段(is_show_list-->列表是否显示0否 1是) - fieldList = fieldList.stream().filter(e -> YesOrNoEnum.YES.getValue().equals(String.valueOf(e.getIsShowList()))).collect(Collectors.toList()); - } + public List> getHeader(String cut) { List> list = new ArrayList<>(); - for (OnlCgformField onlCgformField : fieldList) { - Map map = new HashMap<>(); - if("file_name".equals(onlCgformField.getDbFieldName())){ - //跳转详情的标识 - map.put("click","true"); + 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 (CutEnum.CN.getValue().equals(cut)) { + //中文名称 + map1.put("db_field_name", "db_field_txt");//字段 + map1.put("db_field_txt", "中文名称");//字段中文名 + list.add(map1); + //英文名称 + map2.put("db_field_name", "db_field_en_name");//字段 + map2.put("db_field_txt", "英文名称");//字段中文名 + list.add(map2); + //属性类型 + map3.put("db_field_name", "field_show_type");//字段 + map3.put("db_field_txt", "属性类型");//字段中文名 + list.add(map3); + //字段长度 + map4.put("db_field_name", "db_length");//字段 + map4.put("db_field_txt", "字段长度");//字段中文名 + list.add(map4); + //展示顺序 + map5.put("db_field_name", "order_num");//字段 + map5.put("db_field_txt", "展示顺序");//字段中文名 + list.add(map5); + //展示区域 + map6.put("db_field_name", "show_area");//字段 + map6.put("db_field_txt", "展示区域");//字段中文名 + list.add(map6); + } else { + //中文名称 + map1.put("db_field_name", "db_field_txt");//字段 + map1.put("db_field_txt", "chinese name");//字段英文名 + list.add(map1); + //英文名称 + map2.put("db_field_name", "db_field_en_name");//字段 + map2.put("db_field_txt", "english name");//字段英文名 + list.add(map2); + //属性类型 + map3.put("db_field_name", "field_show_type");//字段 + map3.put("db_field_txt", "attribute type");//字段英文名 + list.add(map3); + //字段长度 + map4.put("db_field_name", "db_length");//字段 + map4.put("db_field_txt", "field length");//字段英文名 + list.add(map4); + //展示顺序 + map5.put("db_field_name", "order_num");//字段 + map5.put("db_field_txt", "display order");//字段英文名 + list.add(map5); + //展示区域 + map6.put("db_field_name", "show_area");//字段 + map6.put("db_field_txt", "display area");//字段英文名 + list.add(map6); } - //单独处理发布日期和标准实施日期 - if ("update_time".equals(onlCgformField.getDbFieldName())) { - map.put("sort", "true");//列表排序标识 - } - - String dbFieldName = onlCgformField.getDbFieldName(); - if (org.apache.commons.lang.StringUtils.isNotBlank(onlCgformField.getDictField())) { - map.put("db_field_name", LineHumpUtil.lineToHump(dbFieldName)+ "_dictText");//配置了数据字典的字段，需要特殊处理 - }else{ - map.put("db_field_name", LineHumpUtil.lineToHump(dbFieldName));//字段 - } - - if(CutEnum.CN.getValue().equals(cut)){ - map.put("db_field_txt", onlCgformField.getDbFieldTxt());//字段中文名 - }else{ - map.put("db_field_txt", onlCgformField.getDbFieldEnName());//字段英文名 - } - list.add(map); - } - return list; + return list; } /** * 查询条件中英文切换 * * @return - */ + */@Autowired + OnlCgformAreaServiceImpl onlCgformAreaService; @Override - public List> queryCondition(String flag, String cut) { - List fieldList = onlCgformFieldService.getFieldList(flag); - if (fieldList.size() != 0) { - //过滤出搜索条件() - fieldList = fieldList.stream().filter(e -> YesOrNoEnum.YES.getValue().equals(String.valueOf(e.getIsQuery()))).collect(Collectors.toList()); - } + public List> queryCondition(String cut) { List> list = new ArrayList<>(); - for (OnlCgformField onlCgformField : fieldList) { - Map map = new HashMap<>(); - map.put("field_show_type", onlCgformField.getFieldShowType());//类型(判断是下拉还是输入框,等等) - map.put("dict_field", onlCgformField.getDictField()); //下拉类型的数据字典编码 - map.put("db_field_name", LineHumpUtil.lineToHump(onlCgformField.getDbFieldName()));//字段 - if (CutEnum.CN.getValue().equals(cut)) { - map.put("db_field_txt", onlCgformField.getDbFieldTxt());//字段中文名 - } else { - map.put("db_field_txt", onlCgformField.getDbFieldEnName());//字段英文名 - } - list.add(map); - } - return list; - } + Map map1 = new HashMap<>(); + Map map2 = new HashMap<>(); + if (CutEnum.CN.getValue().equals(cut)) { + map2= (Map) onlCgformAreaService.queryShowArea(onlCgformArea); + map1.put("db_field_name", "show_area");//字段 + map1.put("db_field_txt", "展示区域");//字段中文名 + map1.put("value", map2); + map1.put("field_show_type", "1"); + list.add(map1); - /** - * 表单中英文切换 - * - * @return - */ - @Override - public List> getForm(String flag, String cut) { - List fieldList = onlCgformFieldService.getFieldList(flag); - if (fieldList.size() != 0) { - //过滤出搜索条件() - fieldList = fieldList.stream().filter(e -> YesOrNoEnum.YES.getValue().equals(String.valueOf(e.getIsShowForm()))).collect(Collectors.toList()); - } - List> list = new ArrayList<>(); - for (OnlCgformField onlCgformField : fieldList) { - Map map = new HashMap<>(); - map.put("area", null);//展示区域。没用到 - map.put("field_show_type", onlCgformField.getFieldShowType());//类型(判断是下拉还是输入框,等等) - map.put("field_must_input", onlCgformField.getFieldMustInput());//是否必填 - map.put("dict_field", onlCgformField.getDictField()); //下拉类型的数据字典编码 - map.put("db_field_name", LineHumpUtil.lineToHump(onlCgformField.getDbFieldName()));//字段 - if (CutEnum.CN.getValue().equals(cut)) { - map.put("db_field_txt", onlCgformField.getDbFieldTxt());//字段中文名 - } else { - map.put("db_field_txt", onlCgformField.getDbFieldEnName());//字段英文名 - } - list.add(map); + } else { + map2= (Map) onlCgformAreaService.queryShowAreaEnName(onlCgformArea); + map1.put("db_field_name", "show_area");//字段 + map1.put("db_field_txt", "display area");//字段英文名 + map1.put("value", map2); + map1.put("field_show_type", "1"); + list.add(map1); } return list; }