From 6e38d26233fa7b6fbaf91b7f77dcb6e29b0ba78c Mon Sep 17 00:00:00 2001 From: xiejunyu Date: Fri, 4 Mar 2022 18:44:14 +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 --- .../system/controller/SysDictController.java | 4 +- .../system/service/ISysDictService.java | 2 +- .../service/impl/SysDictServiceImpl.java | 8 ++- .../controller/OnlCgformAreaController.java | 16 ++++- .../controller/OnlCgformTagController.java | 20 ++++-- .../jero/modules/tag/entity/OnlCgformTag.java | 30 +++++++++ .../tag/service/IOnlCgformAreaService.java | 4 +- .../tag/service/IOnlCgformTagService.java | 8 +-- .../impl/OnlCgformAreaServiceImpl.java | 18 +++--- .../service/impl/OnlCgformTagServiceImpl.java | 61 ++++++++++++------- 10 files changed, 119 insertions(+), 52 deletions(-) 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 43f7d86c3..5166a1fd3 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 @@ -608,8 +608,8 @@ public class SysDictController { * */ @GetMapping(value = "/queryDictName") - public Result> queryDictName(SysDict sysDict) { - List list =sysDictService.queryDictName(sysDict); + public Result> queryDictName(@RequestParam(name = "cut") String cut,SysDict sysDict) { + List list =sysDictService.queryDictName(cut,sysDict); return Result.OK(list); } 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 07ec9d643..fc04ce386 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 @@ -44,7 +44,7 @@ public interface ISysDictService extends IService { * * @return */ - List queryDictName(SysDict sysDict); + List queryDictName(String cut,SysDict sysDict); /** * 根据字典类型删除关联表中其对应的数据 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 79f43aa81..f5ba13688 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 @@ -196,9 +196,13 @@ public class SysDictServiceImpl extends ServiceImpl impl * @return */ @Override - public List queryDictName(SysDict sysDict) { + public List queryDictName(String cut,SysDict sysDict) { QueryWrapper QueryWrapper = new QueryWrapper<>(); - QueryWrapper.select("id", "dict_name","attribute_type").eq("is_tag_dict",1); + if (CutEnum.CN.getValue().equals(cut)) { + QueryWrapper.select("id", "dict_name", "attribute_type").eq("is_tag_dict", 1); + }else{ + QueryWrapper.select("id", "dict_en_name", "attribute_type").eq("is_tag_dict", 1); + } 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 0234b245f..0cd9b4e23 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 @@ -10,6 +10,7 @@ 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 com.jero.modules.tag.service.IOnlCgformTagService; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; import lombok.extern.slf4j.Slf4j; @@ -41,6 +42,8 @@ public class OnlCgformAreaController extends JeroController> queryShowArea(OnlCgformArea onlCgformArea){ - List list = onlCgformAreaService.queryShowArea(onlCgformArea); + public Result> queryShowArea(@RequestParam(name = "cut") String cut,OnlCgformArea onlCgformArea){ + List list = onlCgformAreaService.queryShowArea(cut,onlCgformArea); return Result.OK(list); } /** @@ -143,10 +146,17 @@ public class OnlCgformAreaController extends JeroController delete(@RequestParam(name="id",required=true) String id) { - onlCgformAreaService.deleteById(id); + OnlCgformArea onlCgformArea = onlCgformAreaService.queryById(id); + int count=onlCgformTagService.queryExitArea(onlCgformArea); + if (count > 0) { + return Result.error("该“展示区域”有关联数据，无法删除！"); + }else { + onlCgformAreaService.deleteById(id); + } return Result.OK("删除成功!"); } + /** * 批量删除 * 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 8bdbbb375..e402c6f7e 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 @@ -8,9 +8,9 @@ import com.jero.common.aspect.annotation.AutoLog; import com.jero.common.constant.CommonConstant; 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.tag.entity.OnlCgformArea; import com.jero.modules.tag.entity.OnlCgformTag; -import com.jero.modules.enums.FixedFieldEnum; import com.jero.modules.tag.service.IOnlCgformTagService; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; @@ -45,6 +45,7 @@ public class OnlCgformTagController extends JeroController>> getHeader(@RequestParam(name = "cut") String cut) { - List> list =onlCgformTagService.getHeader(cut); + public Result>> getHeader(@RequestParam(name = "flag") String flag, + @RequestParam(name = "cut") String cut) { + List> list =onlCgformTagService.getHeader(flag,cut); return Result.OK(list); } @@ -92,8 +94,9 @@ public class OnlCgformTagController extends JeroController>> queryCondition(@RequestParam(name = "cut") String cut) { - List> list = onlCgformTagService.queryCondition(cut); + public Result>> queryCondition(@RequestParam(name = "flag") String flag, + @RequestParam(name = "cut") String cut) { + List> list = onlCgformTagService.queryCondition(flag,cut); return Result.OK(list); } @@ -127,6 +130,13 @@ public class OnlCgformTagController extends JeroController { * * @return */ - List queryShowArea(OnlCgformArea onlCgformArea); - - List queryShowAreaEnName(OnlCgformArea onlCgformArea); + List queryShowArea(String cut,OnlCgformArea onlCgformArea); /** * 展示区域查询 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 924eccca7..e433d9551 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 @@ -70,19 +70,19 @@ public interface IOnlCgformTagService extends IService { */ Integer queryExitData(OnlCgformTag onlCgformTag) ; + Integer queryExitArea(OnlCgformArea onlCgformArea); + /** * 列表表头中英文切换 * @param cut * @return */ - List> getHeader(String cut); + List> getHeader(String flag,String cut); /** * 查询条件中英文切换 * @param cut * @return */ - List> queryCondition(String cut); - - + List> queryCondition(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 5b4caee70..796194fb1 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 @@ -109,21 +109,18 @@ public class OnlCgformAreaServiceImpl extends ServiceImpl queryShowArea(OnlCgformArea onlCgformArea) { + public List queryShowArea(String cut,OnlCgformArea onlCgformArea) { QueryWrapper QueryWrapper = new QueryWrapper<>(); if(StringUtils.isNotBlank(onlCgformArea.getIsModel())){ - QueryWrapper.select("id","show_area").orderByAsc("sort"); - } - return list(QueryWrapper); - } - @Override - public List queryShowAreaEnName(OnlCgformArea onlCgformArea) { - QueryWrapper QueryWrapper = new QueryWrapper<>(); - if(StringUtils.isNotBlank(onlCgformArea.getIsModel())){ - QueryWrapper.select("id","en_name").orderByAsc("sort"); + if (CutEnum.CN.getValue().equals(cut)) { + QueryWrapper.select("id","show_area").orderByAsc("sort"); + }else{ + QueryWrapper.select("id","en_name").orderByAsc("sort"); + } } return list(QueryWrapper); } + /** * 展示区域查询 * @@ -165,5 +162,4 @@ public class OnlCgformAreaServiceImpl extends ServiceImpl queryWrapper = new LambdaQueryWrapper<>(); + if (StringUtils.isNotBlank(onlCgformArea.getShowArea())) { + queryWrapper.eq(OnlCgformTag::getShowArea,onlCgformArea.getShowArea()); + } + Integer count = onlCgformTagMapper.selectCount(queryWrapper); + return count; + } /** * 列表表头中英文切换 * * @return */ @Override - public List> getHeader(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)) { + System.out.println("走的cut=cn"); //中文名称 map1.put("db_field_name", "db_field_txt");//字段 map1.put("db_field_txt", "中文名称");//字段中文名 @@ -160,6 +178,7 @@ public class OnlCgformTagServiceImpl extends ServiceImpl> queryCondition(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(onlCgformArea); + map2= (Map) onlCgformAreaService.queryShowArea(cut,onlCgformArea); map1.put("db_field_name", "show_area");//字段 map1.put("db_field_txt", "展示区域");//字段中文名 - map1.put("value", map2); + map1.put("value", String.valueOf(map2)); map1.put("field_show_type", "1"); list.add(map1); } else { - map2= (Map) onlCgformAreaService.queryShowAreaEnName(onlCgformArea); + map2= (Map) onlCgformAreaService.queryShowArea(cut,onlCgformArea); map1.put("db_field_name", "show_area");//字段 map1.put("db_field_txt", "display area");//字段英文名 - map1.put("value", map2); + map1.put("value", String.valueOf(map2)); map1.put("field_show_type", "1"); list.add(map1); }